diff options
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | composer.lock | 63 | ||||
| -rw-r--r-- | index.php | 4 | ||||
| -rw-r--r-- | libs/upgradephp/upgrade.php | 6 |
5 files changed, 71 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 839b01c6e8..3efa959635 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' * The event `Log.getAvailableWriters` has been removed: to add custom log backends, you now need to configure Monolog handlers * The INI options `log_only_when_cli` and `log_only_when_debug_parameter` have been removed +### Library updates +* We added the `symfony/var-dumper` library allowing you to better print any arbitrary PHP variable via `dump($var1, $var2, ...)`. + ### Deprecations * Some duplicate reports from UserSettings plugin have been removed. Widget URLs for those reports will still work till May 1st 2015. Please update those to the new reports of DevicesDetection plugin. * The API method `UserSettings.getBrowserVersion` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserVersions` instead diff --git a/composer.json b/composer.json index d9a930ba15..7e2f5023d7 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,8 @@ "aws/aws-sdk-php": "2.7.1", "phpunit/phpunit": "~4.1", "facebook/xhprof": "dev-master", - "phpseclib/phpseclib": "~0.3.8" + "phpseclib/phpseclib": "~0.3.8", + "symfony/var-dumper": "~2.6" }, "repositories": [ { diff --git a/composer.lock b/composer.lock index 7aaa6ff135..d4d7fa3462 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "27a92c6a859979be2d9fb4df337c8655", + "hash": "f02ab2d393f7883b41d47def753a3088", "packages": [ { "name": "container-interop/container-interop", @@ -269,12 +269,12 @@ "source": { "type": "git", "url": "https://github.com/mnapoli/PHP-DI.git", - "reference": "4676e15f7f014185864fd5f8f0b3cdbd678067d0" + "reference": "d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/4676e15f7f014185864fd5f8f0b3cdbd678067d0", - "reference": "4676e15f7f014185864fd5f8f0b3cdbd678067d0", + "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169", + "reference": "d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169", "shasum": "" }, "require": { @@ -317,7 +317,7 @@ "dependency injection", "di" ], - "time": "2014-12-17 04:49:43" + "time": "2014-12-11 22:24:18" }, { "name": "mnapoli/phpdocreader", @@ -1956,6 +1956,59 @@ "time": "2014-10-01 15:43:05" }, { + "name": "symfony/var-dumper", + "version": "v2.6.1", + "target-dir": "Symfony/Component/VarDumper", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "8f3ee04faeca3b8418229b2efbfc8b2b8625b8aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8f3ee04faeca3b8418229b2efbfc8b2b8625b8aa", + "reference": "8f3ee04faeca3b8418229b2efbfc8b2b8625b8aa", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-symfony_debug": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-0": { + "Symfony\\Component\\VarDumper\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + } + ], + "description": "Symfony mechanism for exploring and dumping PHP variables", + "homepage": "http://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "time": "2014-11-18 10:08:24" + }, + { "name": "symfony/yaml", "version": "v2.5.6", "target-dir": "Symfony/Component/Yaml", @@ -31,14 +31,14 @@ require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php'; // NOTE: the code above this comment must be PHP4 compatible -require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php'; - session_cache_limiter('nocache'); @date_default_timezone_set('UTC'); require_once PIWIK_INCLUDE_PATH . '/core/Loader.php'; \Piwik\Loader::init(); +require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php'; + if(!defined('PIWIK_PRINT_ERROR_BACKTRACE')) { define('PIWIK_PRINT_ERROR_BACKTRACE', false); } diff --git a/libs/upgradephp/upgrade.php b/libs/upgradephp/upgrade.php index 903611c970..c6591b70a9 100644 --- a/libs/upgradephp/upgrade.php +++ b/libs/upgradephp/upgrade.php @@ -696,3 +696,9 @@ if (!function_exists('gzopen') return gzopen64($filename , $mode, $use_include_path); } } + +if (!function_exists('dump')) { + function dump () { + + } +} |