cross-solution / YAWIK

module/Behat/src/CoreContext.php

Doc Comments +2 added lines, -2 removed lines

@@ -104,7 +104,6 @@ 
     
     /**
      * @param $name
-     * @param array $params
      *
      * @return string
      */
@@ -115,6 +114,7 @@ 
 
     /**
      * @When /^I hover over the element "([^"]*)"$/
+     * @param string $locator
      */
     public function iHoverOverTheElement($locator)
     {
@@ -259,7 +259,7 @@ 
     }
     
     /**
-     * @param $locator
+     * @param string $locator
      * @param string $selector
      *
      * @return \Behat\Mink\Element\NodeElement|mixed|null

module/Core/src/Application.php

Doc Comments +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * Get required modules for Yawik
      *
-     * @return array
+     * @return string[]
      */
     public static function getRequiredModules()
     {
@@ -172,7 +172,7 @@ 
 
     /**
      * Setup php server
-     * @return bool
+     * @return null|boolean
      * @codeCoverageIgnore
      */
     private static function setupCliServerEnv()

Spacing +12 added lines, -12 removed lines

@@ -69,7 +69,7 @@ 
      * @param array $loadModules
      * @return array
      */
-    public static function generateModuleConfiguration($loadModules=[])
+    public static function generateModuleConfiguration($loadModules = [])
     {
         $modules = ArrayUtils::merge(
             static::getRequiredModules(),
@@ -152,12 +152,12 @@ 
     {
         $modules = [];
         $configDir = static::getConfigDir();
-        foreach (glob($configDir. '/autoload/*.module.php') as $moduleFile) {
+        foreach (glob($configDir.'/autoload/*.module.php') as $moduleFile) {
             $addModules = require $moduleFile;
             foreach ($addModules as $addModule) {
                 if (strpos($addModule, '-') === 0) {
                     $remove = substr($addModule, 1);
-                    $modules = array_filter($modules, function ($elem) use ($remove) {
+                    $modules = array_filter($modules, function($elem) use ($remove) {
                         return strcasecmp($elem, $remove);
                     });
                 } else {
@@ -178,15 +178,15 @@ 
     private static function setupCliServerEnv()
     {
         $parseUrl = parse_url(substr($_SERVER["REQUEST_URI"], 1));
-        $route = isset($parseUrl['path']) ? $parseUrl['path']:null;
-        if (is_file(__DIR__ . '/' . $route)) {
+        $route = isset($parseUrl['path']) ? $parseUrl['path'] : null;
+        if (is_file(__DIR__.'/'.$route)) {
             if (substr($route, -4) == ".php") {
-                require __DIR__ . '/' . $route;     // Include requested script files
+                require __DIR__.'/'.$route; // Include requested script files
                 exit;
             }
-            return false;           // Serve file as is
+            return false; // Serve file as is
         } else {                    // Fallback to index.php
-            $_GET["q"] = $route;    // Try to emulate the behaviour of a .htaccess here.
+            $_GET["q"] = $route; // Try to emulate the behaviour of a .htaccess here.
         }
         return true;
     }
@@ -196,7 +196,7 @@ 
      */
     public static function loadDotEnv()
     {
-        static $isLoaded=false;
+        static $isLoaded = false;
         if ($isLoaded) {
             return;
         }
@@ -211,9 +211,9 @@ 
         }
 
         //@TODO: should move this version loading to somewhere else
-        $isVendor = strpos(__FILE__, 'modules')!==false || strpos(__FILE__, 'vendor') !== false;
-        $version = getenv('TRAVIS') || $isVendor ? "undefined":exec('git describe');
-        $branch = getenv('TRAVIS') || $isVendor ? "undefined":exec('git rev-parse --abbrev-ref HEAD', $output, $retVal);
+        $isVendor = strpos(__FILE__, 'modules') !== false || strpos(__FILE__, 'vendor') !== false;
+        $version = getenv('TRAVIS') || $isVendor ? "undefined" : exec('git describe');
+        $branch = getenv('TRAVIS') || $isVendor ? "undefined" : exec('git rev-parse --abbrev-ref HEAD', $output, $retVal);
         static::$VERSION = $version.'['.$branch.']';
 
 

module/Core/src/Yawik.php

Doc Comments +1 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     /**
      * Get required modules for Yawik
      *
-     * @return array
+     * @return string[]
      */
     public static function getRequiredModules()
     {
@@ -89,7 +89,6 @@ 
      * Run application
      * @param mixed|array $appConfig
      *
-     * @param bool $run
      * @return bool|ZendApplication
      */
     public static function initApplication($appConfig = null)

Spacing +11 added lines, -11 removed lines

@@ -35,9 +35,9 @@ 
             $dotenv = new Dotenv();
             $dotenv->load($env);
         }
-        $isVendor = strpos(__FILE__, 'modules')!==false || strpos(__FILE__, 'vendor') !== false;
-        $version = getenv('TRAVIS') || $isVendor ? "undefined":exec('git describe');
-        $branch = getenv('TRAVIS') || $isVendor ? "undefined":exec('git rev-parse --abbrev-ref HEAD', $output, $retVal);
+        $isVendor = strpos(__FILE__, 'modules') !== false || strpos(__FILE__, 'vendor') !== false;
+        $version = getenv('TRAVIS') || $isVendor ? "undefined" : exec('git describe');
+        $branch = getenv('TRAVIS') || $isVendor ? "undefined" : exec('git rev-parse --abbrev-ref HEAD', $output, $retVal);
         static::$VERSION = $version.'['.$branch.']';
     }
 
@@ -77,7 +77,7 @@ 
      * @param array $loadModules
      * @return array
      */
-    public static function generateModuleConfiguration($loadModules=[])
+    public static function generateModuleConfiguration($loadModules = [])
     {
         return ArrayUtils::merge(
             static::getRequiredModules(),
@@ -104,7 +104,7 @@ 
             $file = null;
             if (is_file($test = getcwd().'/test/config/config.php')) {
                 $file = $test;
-            } elseif (is_file($test = getcwd(). '/config/config.php')) {
+            } elseif (is_file($test = getcwd().'/config/config.php')) {
                 $file = $test;
             } elseif (is_file($test = __DIR__.'/../config/config.php')) {
                 $file = $test;
@@ -128,7 +128,7 @@ 
         return ZendApplication::init($appConfig);
     }
 
-    public static function runApplication($appConfig=null)
+    public static function runApplication($appConfig = null)
     {
         ini_set('display_errors', true);
         ini_set('error_reporting', E_ALL | E_STRICT);
@@ -143,15 +143,15 @@ 
 
         if (php_sapi_name() == 'cli-server') {
             $parseUrl = parse_url(substr($_SERVER["REQUEST_URI"], 1));
-            $route = isset($parseUrl['path']) ? $parseUrl['path']:null;
-            if (is_file(__DIR__ . '/' . $route)) {
+            $route = isset($parseUrl['path']) ? $parseUrl['path'] : null;
+            if (is_file(__DIR__.'/'.$route)) {
                 if (substr($route, -4) == ".php") {
-                    require __DIR__ . '/' . $route;     // Include requested script files
+                    require __DIR__.'/'.$route; // Include requested script files
                     exit;
                 }
-                return false;           // Serve file as is
+                return false; // Serve file as is
             } else {                    // Fallback to index.php
-                $_GET["q"] = $route;    // Try to emulate the behaviour of a .htaccess here.
+                $_GET["q"] = $route; // Try to emulate the behaviour of a .htaccess here.
             }
         }
 

module/Install/src/Factory/Controller/LazyControllerFactory.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
                             $parameter_instances[] = $container->get($cn);
                         } catch (\Exception $x) {
                             echo __CLASS__
-                                 . " couldn't create an instance of $cn to satisfy the constructor for $requestedName.";
+                                    . " couldn't create an instance of $cn to satisfy the constructor for $requestedName.";
                             exit;
                         }
                     } else {

Spacing +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
     
     public function canCreate(ContainerInterface $container, $requestedName)
     {
-        list($module, ) = explode('\\', __NAMESPACE__, 2);
-        return strstr($requestedName, $module . '\Controller') !== false;
+        list($module,) = explode('\\', __NAMESPACE__, 2);
+        return strstr($requestedName, $module.'\Controller') !== false;
     }
     
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)

module/Install/src/Controller/Index.php

Indentation +2 added lines, -2 removed lines

@@ -61,8 +61,8 @@
             $routeMatch->setParam('action', $p);
             $response = $this->getResponse();
             $response->getHeaders()
-                     ->addHeaderLine('Content-Type', 'application/json')
-                     ->addHeaderLine('Content-Encoding', 'utf8');
+                        ->addHeaderLine('Content-Type', 'application/json')
+                        ->addHeaderLine('Content-Encoding', 'utf8');
         }
     }
 

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
         parent::attachDefaultListeners();
     
         $events = $this->getEventManager();
-        $events->attach(MvcEvent::EVENT_DISPATCH, array( $this, 'preDispatch' ), 100);
+        $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'preDispatch'), 100);
     }
 
     /**

module/Behat/src/InstallContext.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     public function __construct()
     {
-        static::$yawikGlobalConfig = getcwd() . '/config/autoload/yawik.config.global.php';
+        static::$yawikGlobalConfig = getcwd().'/config/autoload/yawik.config.global.php';
         static::$yawikBackupConfig = str_replace('yawik.config.global.php', 'yawik.backup', static::$yawikGlobalConfig);
     }
 

module/Core/config/module.config.php

Spacing +38 added lines, -38 removed lines

@@ -25,7 +25,7 @@ 
 use Zend\I18n\Translator\Resources;
 use Zend\Mvc\MvcEvent;
 
-$doctrineConfig = include __DIR__ . '/doctrine.config.php';
+$doctrineConfig = include __DIR__.'/doctrine.config.php';
 
 
 return array(
@@ -33,7 +33,7 @@ 
     'doctrine' => $doctrineConfig,
 
     'options' => [
-        'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ],
+        'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'],
     ],
     
     'Core' => array(
@@ -277,19 +277,19 @@ 
             'modules/Core/jsonEntityHydrator' => 'Core\Entity\Hydrator\JsonEntityHydratorFactory',
             'Core/EntityHydrator' => 'Core\Entity\Hydrator\EntityHydratorFactory',
             'Core/Options' => 'Core\Factory\ModuleOptionsFactory',
-            'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class,'factory'],
-            'DefaultListeners' => ['Core\Listener\DefaultListener','factory'],
-            'templateProviderStrategy'   => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy','factory'],
-            'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class,'factory'],
+            'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class, 'factory'],
+            'DefaultListeners' => ['Core\Listener\DefaultListener', 'factory'],
+            'templateProviderStrategy'   => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy', 'factory'],
+            'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class, 'factory'],
             'Core/Listener/CreatePaginator' => 'Core\Listener\CreatePaginatorListener::factory',
             'Core/Locale' => 'Core\I18n\LocaleFactory',
             \Core\Listener\AjaxRouteListener::class => \Core\Factory\Listener\AjaxRouteListenerFactory::class,
             \Core\Listener\DeleteImageSetListener::class => \Core\Factory\Listener\DeleteImageSetListenerFactory::class,
             'Imagine' => \Core\Factory\Service\ImagineFactory::class,
-            'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class,'factory'],
-            'Tracy' => [Tracy::class,'factory'],
+            'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class, 'factory'],
+            'Tracy' => [Tracy::class, 'factory'],
             Service\EntityEraser\DefaultEntityLoaderListener::class => Service\EntityEraser\DefaultEntityLoaderListenerFactory::class,
-            ClearCacheService::class => [ClearCacheService::class,'factory']
+            ClearCacheService::class => [ClearCacheService::class, 'factory']
         ),
         'abstract_factories' => array(
             'Core\Factory\OptionsAbstractFactory',
@@ -312,7 +312,7 @@ 
         'translation_file_patterns' => array(
             [
                 'type' => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern' => '%s.mo',
             ],
             [
@@ -357,9 +357,9 @@ 
             'Core/File'    => FileControllerFactory::class,
             'Core/Content' => LazyControllerFactory::class,
             Controller\Console\PurgeController::class => Controller\Console\PurgeControllerFactory::class,
-            AssetsInstallController::class => [AssetsInstallController::class,'factory'],
-            SubsplitController::class => [SubsplitController::class,'factory'],
-            ClearCacheController::class => [ClearCacheController::class,'factory'],
+            AssetsInstallController::class => [AssetsInstallController::class, 'factory'],
+            SubsplitController::class => [SubsplitController::class, 'factory'],
+            ClearCacheController::class => [ClearCacheController::class, 'factory'],
 
         ],
     ),
@@ -372,9 +372,9 @@ 
             'Core/SearchForm' => 'Core\Factory\Controller\Plugin\SearchFormFactory',
             'listquery' => 'Core\Controller\Plugin\ListQuery::factory',
             'mail' => 'Core\Controller\Plugin\Mail::factory',
-            'Core/Mailer' => ['Core\Controller\Plugin\Mailer','factory'],
-            'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class,'factory'],
-            'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class,'factory'],
+            'Core/Mailer' => ['Core\Controller\Plugin\Mailer', 'factory'],
+            'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class, 'factory'],
+            'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class, 'factory'],
             Controller\Plugin\EntityEraser::class => Controller\Plugin\EntityEraserFactory::class,
         ),
         'invokables' => array(
@@ -405,32 +405,32 @@ 
         'exception_template' => 'error/index',
         // Map template to files. Speeds up the lookup through the template stack.
         'template_map' => array(
-            'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml',
-            'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
-            'error/404' => __DIR__ . '/../view/error/404.phtml',
-            'error/403' => __DIR__ . '/../view/error/403.phtml',
-            'error/index' => __DIR__ . '/../view/error/index.phtml',
-            'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml',
-            'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml',
-            'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml',
-            'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml',
-            'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml',
-            'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml',
-            'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml',
-            'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml',
-            'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml',
-            'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml',
-            'core/form/tree-manage.view' => __DIR__ . '/../view/form/tree-manage.view.phtml',
-            'core/form/tree-manage.form' => __DIR__ . '/../view/form/tree-manage.form.phtml',
-            'core/form/tree-add-item' => __DIR__ . '/../view/form/tree-add-item.phtml',
-            'mail/header' =>  __DIR__ . '/../view/mail/header.phtml',
-            'mail/footer' =>  __DIR__ . '/../view/mail/footer.phtml',
-            'mail/footer.en' =>  __DIR__ . '/../view/mail/footer.en.phtml',
+            'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml',
+            'layout/layout' => __DIR__.'/../view/layout/layout.phtml',
+            'error/404' => __DIR__.'/../view/error/404.phtml',
+            'error/403' => __DIR__.'/../view/error/403.phtml',
+            'error/index' => __DIR__.'/../view/error/index.phtml',
+            'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml',
+            'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml',
+            'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml',
+            'core/notifications' => __DIR__.'/../view/partial/notifications.phtml',
+            'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml',
+            'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml',
+            'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml',
+            'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml',
+            'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml',
+            'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml',
+            'core/form/tree-manage.view' => __DIR__.'/../view/form/tree-manage.view.phtml',
+            'core/form/tree-manage.form' => __DIR__.'/../view/form/tree-manage.form.phtml',
+            'core/form/tree-add-item' => __DIR__.'/../view/form/tree-add-item.phtml',
+            'mail/header' =>  __DIR__.'/../view/mail/header.phtml',
+            'mail/footer' =>  __DIR__.'/../view/mail/footer.phtml',
+            'mail/footer.en' =>  __DIR__.'/../view/mail/footer.en.phtml',
             //'startpage' => __DIR__ . '/../view/layout/startpage.phtml',
         ),
         // Where to look for view templates not mapped above
         'template_path_stack' => array(
-            __DIR__ . '/../view',
+            __DIR__.'/../view',
         ),
     ),
     'view_helpers' => array(