DevKit updates for 3.x branch (#863)

* DevKit updates * Applied fixes from FlintCI (#864) Co-authored-by: Sullivan SENECHAL <soullivaneuh@gmail.com>
sonata-project · Mar 31, 2021 · 67d095c · 67d095c
1 parent 535dd83
commit 67d095c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -39,6 +39,7 @@ $rules = [
     'list_syntax' => ['syntax' => 'short'],
     'logical_operators' => true,
     'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+    'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
     'no_extra_blank_lines' => true,
     'no_php4_constructor' => true,
     'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -28,8 +28,7 @@ It's auto-generated by sonata-project/dev-kit package.
 
     <php>
         <ini name="precision" value="8" />
-        <!-- Use max[self]=0 when https://github.com/symfony/symfony/issues/40400 is fixed -->
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=99999" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
         <env name="SYMFONY_PHPUNIT_VERSION" value="9.4" />
     </php>
 

diff --git a/src/Block/BlockContextManager.php b/src/Block/BlockContextManager.php
@@ -182,8 +182,7 @@ protected function configureSettings(OptionsResolver $optionsResolver, BlockInte
             ->addAllowedTypes('extra_cache_keys', 'array')
             ->addAllowedTypes('attr', 'array')
             ->addAllowedTypes('ttl', 'int')
-            ->addAllowedTypes('template', ['string', 'bool'])
-        ;
+            ->addAllowedTypes('template', ['string', 'bool']);
 
         // add type and class settings for block
         $class = ClassUtils::getClass($block);

diff --git a/src/Block/Service/AbstractBlockService.php b/src/Block/Service/AbstractBlockService.php
@@ -128,8 +128,7 @@ public function renderPrivateResponse($view, array $parameters = [], ?Response $
     {
         return $this->renderResponse($view, $parameters, $response)
             ->setTtl(0)
-            ->setPrivate()
-        ;
+            ->setPrivate();
     }
 
     public function setDefaultSettings(OptionsResolverInterface $resolver)

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -231,8 +231,7 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end()
-            ->end()
-        ;
+            ->end();
 
         return $treeBuilder;
     }