Merge branch 'master' of github.com:libre-informatique/SonataSyliusUs…

…erBundle into phpunit

CHANGELOG.md

@@ -1,18 +1,15 @@
 # Change Log
 
-## [Unreleased](https://github.com/libre-informatique/SonataSyliusUserBundle/tree/HEAD)
-
-[Full Changelog](https://github.com/libre-informatique/SonataSyliusUserBundle/compare/0.4.2...HEAD)
+## [0.4.3](https://github.com/libre-informatique/SonataSyliusUserBundle/tree/0.4.3) (2017-06-13)
+[Full Changelog](https://github.com/libre-informatique/SonataSyliusUserBundle/compare/0.4.2...0.4.3)
 
 **Merged pull requests:**
 
+- DevKit updates for SonataSyliusUserBundle [\#9](https://github.com/libre-informatique/SonataSyliusUserBundle/pull/9) ([BlastCI](https://github.com/BlastCI))
+- Add First Unit Test [\#8](https://github.com/libre-informatique/SonataSyliusUserBundle/pull/8) ([FanchTheSystem](https://github.com/FanchTheSystem))
 - Add units tests [\#3](https://github.com/libre-informatique/SonataSyliusUserBundle/pull/3) ([haseo29](https://github.com/haseo29))
 
 ## [0.4.2](https://github.com/libre-informatique/SonataSyliusUserBundle/tree/0.4.2) (2017-05-05)
-**Merged pull requests:**
-
-- DevKit updates for SonataSyliusUserBundle [\#2](https://github.com/libre-informatique/SonataSyliusUserBundle/pull/2) ([BlastCI](https://github.com/BlastCI))
-
 
 
 \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Makefile

@@ -8,7 +8,7 @@ lint:
 	#find . -name '*.yml' -not -path './vendor/*' -not -path './Resources/public/vendor/*' | xargs yaml-lint
 
 test:
-	phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
+	vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
 
 docs:
 	cd src/Resources/doc && sphinx-build -b html -d _build/doctrees . _build/html

bin/ci-scripts/install_test.sh

@@ -3,25 +3,16 @@ set -ev
 
 mkdir --parents "${HOME}/bin"
 
-# PHPUnit install
-# strange sh operator '<' ...
-if [ ${TRAVIS_PHP_VERSION} '<' '7.0' ]; then
-    PHPUNIT_PHAR=phpunit-5.7.phar
-else
-    PHPUNIT_PHAR=phpunit.phar
-fi
-wget "https://phar.phpunit.de/${PHPUNIT_PHAR}" --output-document="${HOME}/bin/phpunit"
-chmod u+x "${HOME}/bin/phpunit"
+# Ugly hack
+echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+composer install --no-interaction --prefer-dist
+composer require --no-interaction --dev phpunit/phpunit 
+composer update --prefer-dist --no-interaction --prefer-stable
+
 
 # Coveralls client install
 wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
 chmod u+x "${HOME}/bin/coveralls"
 
-# Ugly hack
-echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
-if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
-    composer update --prefer-dist --no-interaction --prefer-stable --quiet
-fi
-composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}

composer.json

@@ -5,12 +5,12 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.6",
-        "symfony/symfony": "3.2.*",
+        "symfony/symfony": ">=3.2",
         "sylius/user-bundle": "1.0.x-dev",
-        "blast-project/base-entities-bundle": "^0.4"
+        "blast-project/base-entities-bundle": ">=0.4"
     },
     "require-dev": {
-	"symfony/phpunit-bridge": "3.2.*"
+	"symfony/phpunit-bridge": ">=3.2"
     },
     "config": {
         "sllh-composer-lint": {