Merge 1b84df7 into d21ec11

.editorconfig

@@ -0,0 +1,23 @@
+root = true
+
+[*]
+end_of_line = lf
+indent_style = space
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{yml,twig,php}]
+indent_size = 4
+
+[*.{js,json,scss,css}]
+indent_size = 2
+
+[.travis.yml]
+indent_size = 2
+
+[composer.json]
+indent_size = 4
+
+[Makefile]
+indent_style = tab

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,27 @@
+<!--
+    Before you open an issue, make sure this one does not already exists.
+    Please also read the "guidelines for contributing" link above before posting.
+-->
+
+<!--
+    If you are reporting a bug, please try to fill in the following.
+    Otherwise remove it.
+-->
+
+| Question       | Answer
+|----------------|-------------------------------
+| Bundle version | composer show sonata-project/*
+| Symfony version| composer show symfony/*
+| php version    | php --version
+
+# Error message
+
+```
+Error message goes here
+```
+
+# Steps to reproduce
+
+# Expected results
+
+# Actual results

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,48 @@
+<!-- THE PR TEMPLATE IS NOT AN OPTION. DO NOT DELETE IT! -->
+
+<!--
+    Specify which issues will be fixed/closed.
+    Remove it if this is not related.
+-->
+
+Closes #
+
+### Changelog
+
+<!-- MANDATORY
+    Fill the changelog part inside the code block.
+    Remove unneeded sections.
+    Follow this schema: http://keepachangelog.com/
+-->
+
+```markdown
+### Added
+- Added some `Class::newMethod` to do great stuff
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+```
+
+### Subject
+
+<!-- Describe your Pull Request content here -->
+
+### To do
+
+<!--
+    Complete the tasks.
+    You can add as many tasks as you want.
+    If some are not relevant, just remove them.
+-->
+
+- [ ] My PR stuff
+- [ ] Update the tests
+- [ ] Update the documentation
+- [ ] Add an upgrade note

.php_cs

@@ -1,9 +1,16 @@
 <?php
 
+/*
+ * DO NOT EDIT THIS FILE!
+ *
+ * It's auto-generated by sonata-project/dev-kit package.
+ *
+ * Package `sllh/php-cs-fixer-styleci-bridge` is required to get it working.
+ */
+
 require_once __DIR__.'/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
 
 use SLLH\StyleCIBridge\ConfigBridge;
-use Symfony\CS\Fixer\Contrib\HeaderCommentFixer;
 
 $header = <<<EOF
 This file is part of the Sonata Project package.
@@ -14,8 +21,20 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 EOF;
 
-HeaderCommentFixer::setHeader($header);
+// PHP-CS-Fixer 1.x
+if (class_exists('Symfony\CS\Fixer\Contrib\HeaderCommentFixer')) {
+    \Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
+}
 
-return ConfigBridge::create()
+$config = ConfigBridge::create()
     ->setUsingCache(true)
 ;
+
+// PHP-CS-Fixer 2.x
+if (method_exists($config, 'setRules')) {
+    $config->setRules(array_merge($config->getRules(), array(
+        'header_comment' => array('header' => $header)
+    )));
+}
+
+return $config;

.styleci.yml

@@ -1,17 +1,22 @@
+# DO NOT EDIT THIS FILE!
+#
+# It's auto-generated by sonata-project/dev-kit package.
+#
+# Package `sllh/php-cs-fixer-styleci-bridge` is required to get it working.
+
 preset: symfony
 
 enabled:
-  - align_double_arrow
   - newline_after_open_tag
+  - ordered_class_elements
   - ordered_use
   - long_array_syntax
-  - php_unit_construct
-  - php_unit_strict
-
-disabled:
-  - unalign_double_arrow
-  - unalign_equals
+# Comment strict rules for the moment. Should be uncomment later to see StyleCI PR results
+#  - strict
+#  - strict_param
+#  - php_unit_construct
+#  - php_unit_strict
 
 finder:
   exclude:
-    - Tests/Fixtures
+    - 'Tests/Fixtures'

.travis.yml

@@ -1,60 +1,83 @@
+# DO NOT EDIT THIS FILE!
+#
+# It's auto-generated by sonata-project/dev-kit package.
+
+branches:
+  only:
+    - master
+    - 1.x
+
 language: php
 
 php:
-  - hhvm
+  - '5.4'
+  - '5.5'
+  - '5.6'
+  - '7.0'
   - nightly
+  - hhvm
 
 sudo: false
 
 cache:
   directories:
-    - $HOME/.composer/cache
-    - $HOME/.cache/pip
+    - $HOME/.composer/cache/files
 
 env:
   global:
-    - PATH="$HOME/.composer/vendor/bin:$PATH"
+    - PATH="$HOME/.local/bin:$PATH"
     - SYMFONY_DEPRECATIONS_HELPER=weak
     - TARGET=test
+    - UPSTREAM_URL=https://github.com/sonata-project/SonataTranslationBundle.git
 
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
+    - php: '7.0'
       env: TARGET=docs
-    - php: 5.4
-      env: COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
-    - php: 5.6
-      env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.5
-      env: SYMFONY_VERSION=3.0.*
-    - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.0.*
-
+    - php: '7.0'
+      env: TARGET=lint
+    - php: '5.4'
+      env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: '7.0'
+      env: SYMFONY=2.3.*
+    - php: '7.0'
+      env: SYMFONY=2.7.*
+    - php: '7.0'
+      env: SYMFONY=2.8.*
+    - php: '7.0'
+      env: SYMFONY=dev-master@dev
+    - php: '7.0'
+      env: SONATA_CORE=2.*
+    - php: '7.0'
+      env: SONATA_CORE=dev-master@dev
+    - php: '7.0'
+      env: SONATA_ADMIN=2.*
+    - php: '7.0'
+      env: SONATA_ADMIN=dev-master@dev
+    - php: '7.0'
+      env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
-    - php: hhvm
     - php: nightly
+    - php: hhvm
+    - env: SYMFONY_DEPRECATIONS_HELPER=0
+    - env: SYMFONY=dev-master@dev
+    - env: SONATA_CORE=dev-master@dev
+    - env: SONATA_ADMIN=dev-master@dev
+
+before_install:
+  - git remote add upstream ${UPSTREAM_URL} && git fetch --all
+  - if [[ -x .travis/check_relevant_${TARGET}.sh && "$TRAVIS_PULL_REQUEST" != "false" ]]; then export RELEVANT=$(.travis/check_relevant_${TARGET}.sh); fi;
+  - if [[ ! -z ${RELEVANT} ]];then exit 0; fi;
+  - if [ -x .travis/before_install_${TARGET}.sh ]; then .travis/before_install_${TARGET}.sh; fi;
+
+install:
+  - if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;
 
 before_script:
-  - (phpenv config-rm xdebug.ini || exit 0)
-  - mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d && echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - composer selfupdate
-  - composer config -q -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
-  - composer global require phpunit/phpunit:@stable fabpot/php-cs-fixer --no-update
-  - composer global update --prefer-dist --no-interaction
-  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
-  - travis_wait composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
-  - export PATH=$HOME/.local/bin:$PATH
-  - pip install -r Resources/doc/requirements.txt --user `whoami`
-
-script:
- - make $TARGET
-
-notifications:
-    webhooks: https://sonata-project.org/bundles/translation/master/travis
+  - if [ -x .travis/before_script_${TARGET}.sh ]; then .travis/before_script_${TARGET}.sh; fi;
+
+script: make $TARGET
+
+after_success:
+  - if [ -x .travis/after_success_${TARGET}.sh ]; then .travis/after_success_${TARGET}.sh; fi;

.travis/after_success_test.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+set -ev
+
+coveralls -v

.travis/before_install_test.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env sh
+set -ev
+
+if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
+    mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp
+    echo "memory_limit=3072M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+    if [ ${TRAVIS_PHP_VERSION} '<' '7.0' ]; then
+        echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    fi
+fi
+
+# To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718
+composer self-update --stable
+composer config --quiet --global github-oauth.github.com $GITHUB_OAUTH_TOKEN
+sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
+
+if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;
+if [ "$SONATA_CORE" != "" ]; then composer require "sonata-project/core-bundle:$SONATA_CORE" --no-update; fi;
+if [ "$SONATA_ADMIN" != "" ]; then composer require "sonata-project/admin-bundle:$SONATA_ADMIN" --no-update; fi;

.travis/before_script_test.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+set -ev
+
+if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then
+    mv /tmp/xdebug.ini "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d"
+fi

.travis/check_relevant_docs.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ev
+
+RELEVANT_FILES=$(git diff --name-only HEAD upstream/${TRAVIS_BRANCH} -- '*.rst')
+
+if [[ -z ${RELEVANT_FILES} ]]; then echo -n 'KO'; exit 0; fi;

.travis/check_relevant_lint.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ev
+
+RELEVANT_FILES=$(git diff --name-only HEAD upstream/${TRAVIS_BRANCH} -- *.{json})
+
+if [[ -z ${RELEVANT_FILES} ]]; then echo -n 'KO'; exit 0; fi;

.travis/check_relevant_test.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ev
+
+RELEVANT_FILES=$(git diff --name-only HEAD upstream/${TRAVIS_BRANCH} -- '*.php' '*.yml' '*.xml' '*.twig' '*.js' '*.css' '*.json')
+
+if [[ -z ${RELEVANT_FILES} ]]; then echo -n 'KO'; exit 0; fi;

.travis/install_docs.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+set -ev
+
+pip install -r Resources/doc/requirements.txt --user $(whoami)

.travis/install_lint.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+set -ev
+
+composer global require sllh/composer-lint:@stable --prefer-dist --no-interaction

.travis/install_test.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+set -ev
+
+mkdir --parents "${HOME}/bin"
+
+# PHPUnit install
+if [ ${TRAVIS_PHP_VERSION} '<' '5.6' ]; then
+    PHPUNIT_PHAR=phpunit-old.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"
+
+# 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"
+
+# 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}