cs PSR-12

hummer2k · Dec 26, 2019 · 1eb4039 · 1eb4039
1 parent 8bec574
commit 1eb4039
Show file tree

Hide file tree

Showing 61 changed files with 87 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ before_script:
 
 script:
   - ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
-  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./test/
+  - ./vendor/bin/phpcs --standard=PSR12 ./src/ ./test/
 
 after_script:
   - ./vendor/bin/coveralls -v
diff --git a/src/Block/AbstractBlock.php b/src/Block/AbstractBlock.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Block;
 
 use Zend\View\Model\ViewModel;

diff --git a/src/Block/BlockInterface.php b/src/Block/BlockInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Block;
 
 use Zend\View\Helper\HelperInterface;

diff --git a/src/Block/BlockPool.php b/src/Block/BlockPool.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>
@@ -12,7 +13,7 @@
 
 final class BlockPool implements BlockPoolInterface
 {
-    const ANONYMOUS_ID_PATTERN = 'anonymous.%s.%s';
+    public const ANONYMOUS_ID_PATTERN = 'anonymous.%s.%s';
 
     /**
      * suffix for anonymous block names

diff --git a/src/Block/BlockPoolInterface.php b/src/Block/BlockPoolInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Block/Container.php b/src/Block/Container.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Block/Factory/BlockFactory.php b/src/Block/Factory/BlockFactory.php
@@ -97,7 +97,8 @@ public function createBlock($blockId, array $specs)
     private function prepareOptions(array $specs)
     {
         foreach ($specs as $key => $value) {
-            if (!isset($this->blockDefaults[$key])
+            if (
+                !isset($this->blockDefaults[$key])
                 && !isset($specs['options'][$key])
             ) {
                 $specs['options'][$key] = $value;

diff --git a/src/BlockManagerFactory.php b/src/BlockManagerFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>
@@ -10,5 +11,5 @@
 
 class BlockManagerFactory extends AbstractPluginManagerFactory
 {
-    const PLUGIN_MANAGER_CLASS = 'ConLayout\BlockManager';
+    public const PLUGIN_MANAGER_CLASS = 'ConLayout\BlockManager';
 }
diff --git a/src/Controller/Plugin/LayoutManager.php b/src/Controller/Plugin/LayoutManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Controller\Plugin;
 
 use ConLayout\Block\BlockPoolInterface;

diff --git a/src/Controller/Plugin/LayoutManagerFactory.php b/src/Controller/Plugin/LayoutManagerFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Controller\Plugin;
 
 use ConLayout\Block\BlockPoolInterface;

diff --git a/src/Filter/BasePathFilter.php b/src/Filter/BasePathFilter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Filter;
 
 use Zend\Filter\FilterInterface;

diff --git a/src/Filter/BasePathFilterFactory.php b/src/Filter/BasePathFilterFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Filter/CacheBusterFilterFactory.php b/src/Filter/CacheBusterFilterFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Filter/DebugFilter.php b/src/Filter/DebugFilter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Filter/DebugFilterFactory.php b/src/Filter/DebugFilterFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Filter/TranslateFilterFactory.php b/src/Filter/TranslateFilterFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Generator/BlocksGenerator.php b/src/Generator/BlocksGenerator.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>
@@ -12,9 +13,9 @@
 
 final class BlocksGenerator implements GeneratorInterface
 {
-    const NAME                  = 'blocks';
-    const INSTRUCTION_BLOCKS    = 'blocks';
-    const INSTRUCTION_REFERENCE = 'reference';
+    public const NAME                  = 'blocks';
+    public const INSTRUCTION_BLOCKS    = 'blocks';
+    public const INSTRUCTION_REFERENCE = 'reference';
 
     /**
      * @var BlockFactoryInterface

diff --git a/src/Generator/BlocksGeneratorFactory.php b/src/Generator/BlocksGeneratorFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Generator/GeneratorInterface.php b/src/Generator/GeneratorInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Generator/ViewHelperGenerator.php b/src/Generator/ViewHelperGenerator.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>
@@ -20,8 +21,8 @@ final class ViewHelperGenerator implements GeneratorInterface
 {
     use NamedParametersTrait;
 
-    const NAME          = 'helpers';
-    const INSTRUCTION   = 'helpers';
+    public const NAME          = 'helpers';
+    public const INSTRUCTION   = 'helpers';
 
     /**
      * @var bool
@@ -149,7 +150,8 @@ private function sort($data)
      */
     private function filterArgs(array $instruction)
     {
-        if (!isset($instruction['filter']) ||
+        if (
+            !isset($instruction['filter']) ||
             !$instruction['filter'] ||
             null === $this->filterManager
         ) {

diff --git a/src/Generator/ViewHelperGeneratorFactory.php b/src/Generator/ViewHelperGeneratorFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Layout/Layout.php b/src/Layout/Layout.php
@@ -124,7 +124,8 @@ public function generate(array $generators = [])
     {
         $layoutStructure = $this->updater->getLayoutStructure();
         foreach ($this->generators as $name => $generator) {
-            if (!$this->isGeneratorLoaded($name)
+            if (
+                !$this->isGeneratorLoaded($name)
                 && (empty($generators) || isset($generators[$name]))
             ) {
                 $generator->generate($layoutStructure);
@@ -151,7 +152,8 @@ public function injectBlocks()
             $this->blockPool->sort();
             $blocks = $this->blockPool->get();
             foreach ($blocks as $blockId => $block) {
-                if ($this->isAllowed($blockId, $block) &&
+                if (
+                    $this->isAllowed($blockId, $block) &&
                     $blockId !== self::BLOCK_ID_ROOT
                 ) {
                     list($parent, $captureTo) = $this->getCaptureTo($block);

diff --git a/src/Layout/LayoutFactory.php b/src/Layout/LayoutFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Layout/LayoutInterface.php b/src/Layout/LayoutInterface.php
@@ -14,17 +14,17 @@ interface LayoutInterface
     /**
      * block id of root view model
      */
-    const BLOCK_ID_ROOT = 'root';
+    public const BLOCK_ID_ROOT = 'root';
 
     /**
      * block id of view model returned by controller
      */
-    const BLOCK_ID_ACTION_RESULT = 'action.result';
+    public const BLOCK_ID_ACTION_RESULT = 'action.result';
 
     /**
      * delimiter block_id::cpature_to
      */
-    const CAPTURE_TO_DELIMITER = '::';
+    public const CAPTURE_TO_DELIMITER = '::';
 
     /**
      * retrieve single block by block id

diff --git a/src/Listener/ActionHandlesListener.php b/src/Listener/ActionHandlesListener.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Listener;
 
 use ConLayout\Handle\Handle;
@@ -15,7 +16,7 @@
  */
 class ActionHandlesListener extends InjectTemplateListener
 {
-    const SEPARATOR = '/';
+    public const SEPARATOR = '/';
 
     /**
      * Layout updater instance.
@@ -95,8 +96,8 @@ private function getActionHandles(EventInterface $event)
 
         foreach ($templateParts as $name) {
             $priority += 10;
-            $actionHandles[] = new Handle($previousHandle.$name, $priority);
-            $previousHandle .= $name.self::SEPARATOR;
+            $actionHandles[] = new Handle($previousHandle . $name, $priority);
+            $previousHandle .= $name . self::SEPARATOR;
         }
 
         return $actionHandles;

diff --git a/src/Listener/BodyClassListener.php b/src/Listener/BodyClassListener.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Listener;
 
 use ConLayout\View\Helper\BodyClass;

diff --git a/src/Listener/Factory/ActionHandlesListenerFactory.php b/src/Listener/Factory/ActionHandlesListenerFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Listener\Factory;
 
 use ConLayout\Listener\ActionHandlesListener;

diff --git a/src/Listener/Factory/BodyClassListenerFactory.php b/src/Listener/Factory/BodyClassListenerFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Listener\Factory;
 
 use ConLayout\Listener\BodyClassListener;

diff --git a/src/Listener/Factory/PrepareActionViewModelListenerFactory.php b/src/Listener/Factory/PrepareActionViewModelListenerFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Listener/LoadLayoutListener.php b/src/Listener/LoadLayoutListener.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout\Listener;
 
 use ConLayout\Layout\LayoutInterface;

diff --git a/src/Module.php b/src/Module.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ConLayout;
 
 use ConLayout\Filter\DebugFilter;

diff --git a/src/Options/ModuleOptions.php b/src/Options/ModuleOptions.php
@@ -154,7 +154,7 @@ public function isPreferRouteMatchController()
      */
     public function setPreferRouteMatchController($preferRouteMatchController)
     {
-        $this->preferRouteMatchController = (boolean) $preferRouteMatchController;
+        $this->preferRouteMatchController = (bool) $preferRouteMatchController;
 
         return $this;
     }

diff --git a/src/Options/ModuleOptionsFactory.php b/src/Options/ModuleOptionsFactory.php
@@ -22,7 +22,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $config = $container->get('Config');
         $options = isset($config['con-layout']) ? $config['con-layout'] : [];
 
-        if (!isset($options['controller_map'])
+        if (
+            !isset($options['controller_map'])
             && isset($config['view_manager']['controller_map'])
         ) {
             $options['controller_map'] = (array) $config['view_manager']['controller_map'];

diff --git a/src/Sorter/BeforeAfterComparison.php b/src/Sorter/BeforeAfterComparison.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Sorter/DependentComparison.php b/src/Sorter/DependentComparison.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Sorter/OrderComparison.php b/src/Sorter/OrderComparison.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Sorter/SorterInterface.php b/src/Sorter/SorterInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Updater/Collector/CollectorInterface.php b/src/Updater/Collector/CollectorInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Updater/Collector/ConfigCollector.php b/src/Updater/Collector/ConfigCollector.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>
@@ -11,7 +12,7 @@
 
 class ConfigCollector implements CollectorInterface
 {
-    const NAME = 'config';
+    public const NAME = 'config';
 
     /**
      * @var array

diff --git a/src/Updater/Collector/ConfigCollectorFactory.php b/src/Updater/Collector/ConfigCollectorFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Updater/Collector/FilesystemCollector.php b/src/Updater/Collector/FilesystemCollector.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>
@@ -14,7 +15,7 @@
 
 class FilesystemCollector implements CollectorInterface
 {
-    const NAME = 'filesystem';
+    public const NAME = 'filesystem';
 
     /**
      *

diff --git a/src/Updater/Collector/FilesystemCollectorFactory.php b/src/Updater/Collector/FilesystemCollectorFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ConLayout
  * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>

diff --git a/src/Updater/Event/UpdateEvent.php b/src/Updater/Event/UpdateEvent.php
@@ -11,8 +11,8 @@
  */
 class UpdateEvent extends Event
 {
-    const EVENT_COLLECT      = 'collect';
-    const EVENT_COLLECT_POST = 'collect.post';
+    public const EVENT_COLLECT      = 'collect';
+    public const EVENT_COLLECT_POST = 'collect.post';
 
     /**
      *