DevKit updates for 3.x branch (#501)

* DevKit updates

* Applied fixes from FlintCI (#502)

* DevKit updates

.travis/before_install_test.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 set -ev
 
 PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/"
@@ -9,5 +9,6 @@ echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
 
 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 [ "$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;
+

.travis/install_test.sh

@@ -4,7 +4,12 @@ set -ev
 mkdir --parents "${HOME}/bin"
 
 # PHPUnit install
-wget "https://phar.phpunit.de/phpunit-5.7.phar" --output-document="${HOME}/bin/phpunit"
+if [ "${TRAVIS_BRANCH}" = 'master' ]; then
+    PHPUNIT_VERSION=7
+else
+    PHPUNIT_VERSION=5.7
+fi
+wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit"
 chmod u+x "${HOME}/bin/phpunit"
 
 # Coveralls client install

phpunit.xml.dist

@@ -14,7 +14,6 @@ It's auto-generated by sonata-project/dev-kit package.
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>

src/Block/BlockContextManager.php

@@ -120,7 +120,7 @@ public function get($meta, array $settings = [])
         if (!$meta instanceof BlockInterface) {
             $block = $this->blockLoader->load($meta);
 
-            if (is_array($meta) && isset($meta['settings'])) {
+            if (\is_array($meta) && isset($meta['settings'])) {
                 // merge user settings
                 $settings = array_merge($meta['settings'], $settings);
             }
@@ -166,7 +166,7 @@ public function get($meta, array $settings = [])
      */
     protected function setDefaultSettings(OptionsResolverInterface $optionsResolver, BlockInterface $block)
     {
-        if (__CLASS__ !== get_called_class()) {
+        if (__CLASS__ !== \get_called_class()) {
             @trigger_error(
                 'The '.__METHOD__.' is deprecated since version 2.3, to be renamed in 4.0.'
                 .' Use '.__CLASS__.'::configureSettings instead.',
@@ -259,17 +259,17 @@ private function resolve(BlockInterface $block, $settings)
 
         // Caching method reflection
         // NEXT_MAJOR: Remove everything here
-        $serviceClass = get_class($service);
+        $serviceClass = \get_class($service);
         if (!isset($this->reflectionCache[$serviceClass])) {
             $reflector = new \ReflectionMethod($service, 'setDefaultSettings');
-            $isOldOverwritten = get_class($service) === $reflector->getDeclaringClass()->getName();
+            $isOldOverwritten = \get_class($service) === $reflector->getDeclaringClass()->getName();
 
             // Prevention for service classes implementing directly the interface and not extends the new base class
             if (!method_exists($service, 'configureSettings')) {
                 $isNewOverwritten = false;
             } else {
                 $reflector = new \ReflectionMethod($service, 'configureSettings');
-                $isNewOverwritten = get_class($service) === $reflector->getDeclaringClass()->getName();
+                $isNewOverwritten = \get_class($service) === $reflector->getDeclaringClass()->getName();
             }
 
             $this->reflectionCache[$serviceClass] = [

src/Block/BlockServiceManager.php

@@ -108,7 +108,7 @@ public function setServices(array $blockServices)
     public function getServices()
     {
         foreach ($this->services as $name => $id) {
-            if (is_string($id)) {
+            if (\is_string($id)) {
                 $this->load($id);
             }
         }
@@ -130,7 +130,7 @@ public function getServicesByContext($context, $includeContainers = true)
         $containers = $this->container->getParameter('sonata.block.container.types');
 
         foreach ($this->contexts[$context] as $name) {
-            if (!$includeContainers && in_array($name, $containers)) {
+            if (!$includeContainers && \in_array($name, $containers)) {
                 continue;
             }
 

src/Block/Loader/ServiceLoader.php

@@ -38,15 +38,15 @@ public function __construct(array $types)
      */
     public function exists($type)
     {
-        return in_array($type, $this->types, true);
+        return \in_array($type, $this->types, true);
     }
 
     /**
      * {@inheritdoc}
      */
     public function load($configuration)
     {
-        if (!in_array($configuration['type'], $this->types)) {
+        if (!\in_array($configuration['type'], $this->types)) {
             throw new \RuntimeException(sprintf(
                 'The block type "%s" does not exist',
                 $configuration['type']
@@ -69,7 +69,7 @@ public function load($configuration)
      */
     public function support($configuration)
     {
-        if (!is_array($configuration)) {
+        if (!\is_array($configuration)) {
             return false;
         }
 

src/Block/Service/MenuBlockService.php

@@ -69,7 +69,7 @@ public function __construct($name, EngineInterface $templating, MenuProviderInte
             $this->menuRegistry = $menuRegistry;
         } elseif (null === $menuRegistry) {
             $this->menuRegistry = new MenuRegistry();
-        } elseif (is_array($menuRegistry)) { //NEXT_MAJOR: Remove this case
+        } elseif (\is_array($menuRegistry)) { //NEXT_MAJOR: Remove this case
             @trigger_error(
                 'Initializing '.__CLASS__.' with an array parameter is deprecated since 3.3 and will be removed in 4.0.',
                 E_USER_DEPRECATED

src/DependencyInjection/Compiler/TweakCompilerPass.php

@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
             $arguments = $definition->getArguments();
 
             // Replace empty block id with service id
-            if (empty($arguments) || 0 == strlen($arguments[0])) {
+            if (empty($arguments) || 0 == \strlen($arguments[0])) {
                 // NEXT_MAJOR: Remove the condition when Symfony 2.8 support will be dropped.
                 if (method_exists($definition, 'setArgument')) {
                     $definition->setArgument(0, $id);
@@ -89,12 +89,12 @@ public function applyContext(ContainerBuilder $container)
         $definition = $container->findDefinition('sonata.block.context_manager');
 
         foreach ($container->getParameter('sonata_block.blocks') as $service => $settings) {
-            if (count($settings['settings']) > 0) {
+            if (\count($settings['settings']) > 0) {
                 $definition->addMethodCall('addSettingsByType', [$service, $settings['settings'], true]);
             }
         }
         foreach ($container->getParameter('sonata_block.blocks_by_class') as $class => $settings) {
-            if (count($settings['settings']) > 0) {
+            if (\count($settings['settings']) > 0) {
                 $definition->addMethodCall('addSettingsByClass', [$class, $settings['settings'], true]);
             }
         }

src/DependencyInjection/Configuration.php

@@ -51,14 +51,14 @@ public function getConfigTreeBuilder()
             ->validate()
                 ->always(function ($value) {
                     foreach ($value['blocks'] as $name => &$block) {
-                        if (0 == count($block['contexts'])) {
+                        if (0 == \count($block['contexts'])) {
                             $block['contexts'] = $value['default_contexts'];
                         }
                     }
 
                     if (isset($value['profiler']['container_types']) && !empty($value['profiler']['container_types'])
                         && isset($value['container']['types']) && !empty($value['container']['types'])
-                        && 0 !== count(array_diff($value['profiler']['container_types'], $value['container']['types']))) {
+                        && 0 !== \count(array_diff($value['profiler']['container_types'], $value['container']['types']))) {
                         throw new \RuntimeException('You cannot have different config options for sonata_block.profiler.container_types and sonata_block.container.types; the first one is deprecated, in case of doubt use the latter');
                     }
 
@@ -165,7 +165,7 @@ public function getConfigTreeBuilder()
                     ->prototype('scalar')->end()
                     ->validate()
                         ->always(function ($value) {
-                            if (count($value) > 0) {
+                            if (\count($value) > 0) {
                                 @trigger_error(
                                     'The menus configuration key is deprecated since 3.3 and will be removed in 4.0.',
                                     E_USER_DEPRECATED

src/DependencyInjection/SonataBlockExtension.php

@@ -106,7 +106,7 @@ public function configureBlockContainers(ContainerBuilder $container, array $con
      */
     public function fixConfigurationDeprecation(array &$config)
     {
-        if (count(array_diff($config['profiler']['container_types'], $config['container']['types']))) {
+        if (\count(array_diff($config['profiler']['container_types'], $config['container']['types']))) {
             $config['container']['types'] = array_merge($config['profiler']['container_types'], $config['container']['types']);
         }
     }
@@ -188,7 +188,7 @@ public function configureForm(ContainerBuilder $container, array $config)
         $contexts = [];
 
         foreach ($config['blocks'] as $service => $settings) {
-            if (0 == count($settings['contexts'])) {
+            if (0 == \count($settings['contexts'])) {
                 $settings['contexts'] = $defaults;
             }
 

src/Model/BaseBlock.php

@@ -278,6 +278,6 @@ public function getTtl()
      */
     public function hasChildren()
     {
-        return count($this->children) > 0;
+        return \count($this->children) > 0;
     }
 }

src/Profiler/DataCollector/BlockDataCollector.php

@@ -72,7 +72,7 @@ public function collect(Request $request, Response $response, \Exception $except
 
         // split into containers & real blocks
         foreach ($this->blocks as $id => $block) {
-            if (!is_array($block)) {
+            if (!\is_array($block)) {
                 return; // something went wrong while collecting information
             }
 
@@ -84,7 +84,7 @@ public function collect(Request $request, Response $response, \Exception $except
                 continue;
             }
 
-            if (in_array($block['type'], $this->containerTypes)) {
+            if (\in_array($block['type'], $this->containerTypes)) {
                 $this->containers[$id] = $block;
             } else {
                 $this->realBlocks[$id] = $block;
@@ -99,7 +99,7 @@ public function collect(Request $request, Response $response, \Exception $except
      */
     public function getTotalBlock()
     {
-        return count($this->realBlocks) + count($this->containers);
+        return \count($this->realBlocks) + \count($this->containers);
     }
 
     /**

src/Templating/Helper/BlockHelper.php

@@ -147,7 +147,7 @@ public function includeJavascripts($media, $basePath = '')
      */
     public function includeStylesheets($media, $basePath = '')
     {
-        if (0 === count($this->assets['css'])) {
+        if (0 === \count($this->assets['css'])) {
             return '';
         }
 
@@ -438,9 +438,9 @@ protected function getEventListeners($eventName)
         foreach ($this->eventDispatcher->getListeners($eventName) as $listener) {
             if ($listener instanceof \Closure) {
                 $results[] = '{closure}()';
-            } elseif (is_object($listener[0])) {
-                $results[] = get_class($listener[0]);
-            } elseif (is_string($listener[0])) {
+            } elseif (\is_object($listener[0])) {
+                $results[] = \get_class($listener[0]);
+            } elseif (\is_string($listener[0])) {
                 $results[] = $listener[0];
             } else {
                 $results[] = 'Unknown type!';

src/Util/RecursiveBlockIterator.php

@@ -25,7 +25,7 @@ class RecursiveBlockIterator extends \RecursiveArrayIterator implements \Recursi
      */
     public function __construct($array)
     {
-        if (is_object($array)) {
+        if (\is_object($array)) {
             $array = $array->toArray();
         }
 

tests/Block/BlockServiceManagerTest.php

@@ -30,7 +30,7 @@ public function testGetBlockService()
         $block = $this->createMock('Sonata\BlockBundle\Model\BlockInterface');
         $block->expects($this->any())->method('getType')->will($this->returnValue('test'));
 
-        $this->assertInstanceOf(get_class($service), $manager->get($block));
+        $this->assertInstanceOf(\get_class($service), $manager->get($block));
     }
 
     public function testInvalidServiceType()
@@ -49,7 +49,7 @@ public function testInvalidServiceType()
         $block = $this->createMock('Sonata\BlockBundle\Model\BlockInterface');
         $block->expects($this->any())->method('getType')->will($this->returnValue('test'));
 
-        $this->assertInstanceOf(get_class($service), $manager->get($block));
+        $this->assertInstanceOf(\get_class($service), $manager->get($block));
     }
 
     public function testGetBlockServiceException()

tests/Exception/Renderer/InlineDebugRendererTest.php

@@ -98,7 +98,7 @@ public function testRenderWithDebugEnabled()
     public function arrayHasKeyValue($key, $value)
     {
         return new \PHPUnit_Framework_Constraint_Callback(function ($test) use ($key, $value) {
-            return is_array($test) && array_key_exists($key, $test) && $test[$key] === $value;
+            return \is_array($test) && array_key_exists($key, $test) && $test[$key] === $value;
         });
     }
 }

tests/Twig/Extension/BlockExtensionTest.php

@@ -73,6 +73,6 @@ public function testFunction($name, $args, $expectedMethod)
 
         $func = $this->env->getFunction($name);
         $this->assertInstanceOf('Twig_SimpleFunction', $func);
-        call_user_func_array($func->getCallable(), $args);
+        \call_user_func_array($func->getCallable(), $args);
     }
 }