DevKit updates for 2.x branch

.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-ci.yml]
+indent_size = 2
+
+[composer.json]
+indent_size = 4
+
+[Makefile]
+indent_style = tab

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,23 @@
+Delete this sentence after you read the "Issues" paragraph from the
+"guidelines for contributing" link above.
+
+If you are reporting a bug, please try to fill in the following, otherwise
+remove it along with this sentence.
+
+| 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

.php_cs

@@ -1,20 +1,29 @@
 <?php
 
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->in(array(__DIR__))
-    ->exclude(array('Tests/Fixtures'))
-;
+/*
+ * 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.
+
+(c) Thomas Rabaix <[email protected]>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+EOF;
+
+HeaderCommentFixer::setHeader($header);
 
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers(array(
-        '-unalign_double_arrow',
-        '-unalign_equals',
-        'align_double_arrow',
-        'newline_after_open_tag',
-        'ordered_use',
-        'long_array_syntax',
-    ))
+return ConfigBridge::create()
     ->setUsingCache(true)
-    ->finder($finder)
 ;

.styleci.yml

@@ -0,0 +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:
+  - newline_after_open_tag
+  - ordered_class_elements
+  - ordered_use
+  - long_array_syntax
+# 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'

.travis.yml

@@ -1,62 +1,73 @@
+# DO NOT EDIT THIS FILE!
+#
+# It's auto-generated by sonata-project/dev-kit package.
+
 language: php
 
 php:
-  - hhvm
+  - '5.3'
+  - '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
 
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
-      env: TARGET=cs_dry_run
-    - php: 7.0
+    - php: '7.0'
       env: TARGET=docs
-    - php: 5.3
-      env: COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
-    - php: 5.6
+    - php: '5.3'
+      env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: '7.0'
       env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
+    - php: '7.0'
+      env: SYMFONY_VERSION=2.6.*
+    - php: '7.0'
       env: SYMFONY_VERSION=2.7.*
-    - php: 5.6
+    - php: '7.0'
       env: SYMFONY_VERSION=2.8.*
-    - php: 5.5
+    - php: '7.0'
       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: SYMFONY_VERSION=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_VERSION=dev-master@dev
+
+before_install:
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp; fi;
+  - if [ "$TARGET" = 'test' ]; then composer self-update --stable; fi;
+  - if [ "$TARGET" = 'test' ]; then composer config --quiet --global github-oauth.github.com $GITHUB_OAUTH_TOKEN; fi;
+  - if [ "$TARGET" = 'test' ]; then sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json; fi;
+  - if [ "$TARGET" = 'test' -a "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
+
+install:
+  - if [ "$TARGET" = 'test' ]; then mkdir "$HOME/bin"; fi;
+  - if [[ "$TARGET" = 'test' && "$TRAVIS_PHP_VERSION" < '5.6' ]]; then wget https://phar.phpunit.de/phpunit-old.phar --output-document="$HOME/bin/phpunit"; fi
+  - if [[ "$TARGET" = 'test' && ! "$TRAVIS_PHP_VERSION" < '5.6' ]]; then wget https://phar.phpunit.de/phpunit.phar --output-document="$HOME/bin/phpunit"; fi
+  - if [ "$TARGET" = 'test' ]; then chmod u+x "$HOME/bin/phpunit"; fi;
+  - if [ "$TARGET" = 'test' ]; then travis_wait composer update --prefer-dist --no-interaction --prefer-stable $COMPOSER_FLAGS; fi;
+  - if [ "$TARGET" = 'docs' ]; then pip install -r Resources/doc/requirements.txt --user `whoami`; 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/seo/master/travis
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv /tmp/xdebug.ini "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d"; fi;
+
+script: make $TARGET

Block/Breadcrumb/BaseBreadcrumbMenuBlockService.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <[email protected]>
  *
@@ -71,6 +71,20 @@ public function getName()
         return sprintf('Breadcrumb %s', $this->context);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function configureSettings(OptionsResolver $resolver)
+    {
+        parent::configureSettings($resolver);
+
+        $resolver->setDefaults(array(
+            'menu_template' => 'SonataSeoBundle:Block:breadcrumb.html.twig',
+            'include_homepage_link' => true,
+            'context' => false,
+        ));
+    }
+
     /**
      * @return FactoryInterface
      */
@@ -87,20 +101,6 @@ protected function getContext()
         return $this->context;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function configureSettings(OptionsResolver $resolver)
-    {
-        parent::configureSettings($resolver);
-
-        $resolver->setDefaults(array(
-            'menu_template'         => 'SonataSeoBundle:Block:breadcrumb.html.twig',
-            'include_homepage_link' => true,
-            'context'               => false,
-        ));
-    }
-
     /**
      * Initialize breadcrumb menu.
      *

Block/Breadcrumb/HomepageBreadcrumbBlockService.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <[email protected]>
  *

Block/Social/BaseFacebookSocialPluginsBlockService.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata project.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <[email protected]>
  *
@@ -27,7 +27,7 @@ abstract class BaseFacebookSocialPluginsBlockService extends BaseBlockService
      */
     protected $colorschemeList = array(
         'light' => 'form.label_colorscheme_light',
-        'dark'  => 'form.label_colorscheme_dark',
+        'dark' => 'form.label_colorscheme_dark',
     );
 
     /**
@@ -38,7 +38,7 @@ public function execute(BlockContextInterface $blockContext, Response $response
         $settings = $blockContext->getSettings();
 
         return $this->renderResponse($blockContext->getTemplate(), array(
-            'block'    => $blockContext->getBlock(),
+            'block' => $blockContext->getBlock(),
             'settings' => $settings,
         ), $response);
     }