From bf465eb6db8ec3424d3ba976280bb16b83a28823 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 23 Mar 2016 10:13:06 +0100 Subject: [PATCH] [travis] Upgrade phpunit wrapper & hirak/prestissimo --- .composer/composer.lock | 10 +++++----- .composer/config.json | 7 +++++++ .travis.yml | 11 ++++++----- appveyor.yml | 4 ++-- phpunit | 12 +++++++++--- .../Component/PropertyAccess/PropertyAccessor.php | 2 +- .../PropertyAccess/Tests/PropertyAccessorTest.php | 2 +- 7 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 .composer/config.json diff --git a/.composer/composer.lock b/.composer/composer.lock index 5b0ec6605bd15..8e037ebb4af81 100644 --- a/.composer/composer.lock +++ b/.composer/composer.lock @@ -9,16 +9,16 @@ "packages": [ { "name": "hirak/prestissimo", - "version": "0.1.15", + "version": "0.1.18", "source": { "type": "git", "url": "https://github.com/hirak/prestissimo.git", - "reference": "f735c4f92061dae7829a6797d74bd543501d7d05" + "reference": "84e9fb79ec18a4428c5a0c032eacac640d89be5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hirak/prestissimo/zipball/f735c4f92061dae7829a6797d74bd543501d7d05", - "reference": "f735c4f92061dae7829a6797d74bd543501d7d05", + "url": "https://codeload.github.com/hirak/prestissimo/legacy.zip/84e9fb79ec18a4428c5a0c032eacac640d89be5d", + "reference": "84e9fb79ec18a4428c5a0c032eacac640d89be5d", "shasum": "" }, "require": { @@ -56,7 +56,7 @@ "parallel", "speedup" ], - "time": "2016-03-07 10:12:34" + "time": "2016-03-17 13:53:53" } ], "packages-dev": [], diff --git a/.composer/config.json b/.composer/config.json new file mode 100644 index 0000000000000..941bc3b56e8cd --- /dev/null +++ b/.composer/config.json @@ -0,0 +1,7 @@ +{ + "config": { + "preferred-install": { + "*": "dist" + } + } +} diff --git a/.travis.yml b/.travis.yml index 22d38d3e11fda..50607933e4f42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ before_install: - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi; - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; - if [[ $deps != skip ]]; then composer self-update; fi; - - if [[ $deps != skip && $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer/* ~/.composer/; composer global install --prefer-dist; fi; + - if [[ $deps != skip && $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer/* ~/.composer/; composer global install; fi; - if [[ $deps != skip ]]; then ./phpunit install; fi; - export PHPUNIT=$(readlink -f ./phpunit) @@ -60,17 +60,18 @@ install: - if [[ $deps != skip && $deps ]]; then php .travis.php $TRAVIS_COMMIT_RANGE $TRAVIS_BRANCH $COMPONENTS; fi; # For the master branch when deps=high, the version before master is checked out and tested with the locally patched components - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//); else SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*'); fi; - - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then git fetch origin $SYMFONY_VERSION; git checkout -m FETCH_HEAD; COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi; + - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then git fetch origin $SYMFONY_VERSION; git checkout -m FETCH_HEAD; COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); ./phpunit install; fi; # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number than the next one - if [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]]; then LEGACY=,legacy; fi; - export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev; - - if [[ ! $deps ]]; then composer update --prefer-dist; else export SYMFONY_DEPRECATIONS_HELPER=weak; fi; + - if [[ ! $deps ]]; then composer update; else export SYMFONY_DEPRECATIONS_HELPER=weak; fi; + - if [[ $TRAVIS_BRANCH = master ]]; then export SYMFONY_PHPUNIT_OVERLOAD=1; fi; - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi; script: - if [[ ! $deps ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi; - if [[ ! $deps ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi; - if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi; - - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --prefer-dist; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi; - - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --prefer-dist --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; + - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi; + - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; - if [[ $deps = skip ]]; then echo This matrix line is skipped for pull requests.; fi; diff --git a/appveyor.yml b/appveyor.yml index d498927fa6913..308b7658840ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,10 +54,10 @@ install: - cd c:\projects\symfony - mkdir %APPDATA%\Composer - IF %APPVEYOR_REPO_NAME%==symfony/symfony copy /Y .composer\* %APPDATA%\Composer\ - - IF %APPVEYOR_REPO_NAME%==symfony/symfony composer global install --prefer-dist --no-progress --ansi || echo curl.cainfo needs PHP 5.3.7 + - IF %APPVEYOR_REPO_NAME%==symfony/symfony composer global install --no-progress --ansi || echo curl.cainfo needs PHP 5.3.7 - php phpunit install - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev) - - composer update --prefer-dist --no-progress --ansi + - composer update --no-progress --ansi test_script: - cd c:\projects\symfony diff --git a/phpunit b/phpunit index 9806b0053f6df..b05ac28199bc0 100755 --- a/phpunit +++ b/phpunit @@ -11,7 +11,7 @@ */ // Please update when phpunit needs to be reinstalled with fresh deps: -// Cache-Id-Version: 2016-03-16 15:36 UTC +// Cache-Id-Version: 2016-03-22 17:23 UTC use Symfony\Component\Process\ProcessUtils; @@ -54,11 +54,17 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__ passthru("$COMPOSER remove --no-update symfony/yaml"); passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=3.1@dev\""); passthru("$COMPOSER install --prefer-dist --no-progress --ansi"); - file_put_contents('phpunit', <<addPsr4('Symfony\\Bridge\\PhpUnit\\', array('src/Symfony/Bridge/PhpUnit'), true); +} +unset($loader); Symfony\Bridge\PhpUnit\TextUI\Command::main(); EOPHP diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 4b5b6db71f26f..42e3671754891 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -196,7 +196,7 @@ public function setValue(&$objectOrArray, $propertyPath, $value) // as well as all its ancients in the property path are all passed by reference, // then there is no need to continue the value setting process if (is_object($zval[self::VALUE]) || isset($zval[self::IS_REF_CHAINED])) { - return; + break; } } diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php index ddd4b4dc8cbb8..8429b7f3d5c73 100644 --- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php +++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php @@ -411,7 +411,7 @@ public function getValidPropertyPaths() */ public function testThrowTypeError() { - $this->propertyAccessor->setValue(new TypeHinted(), 'date', 'This is a string, \DateTime excepted.'); + $this->propertyAccessor->setValue(new TypeHinted(), 'date', 'This is a string, \DateTime expected.'); } public function testSetTypeHint()