cross-solution / YAWIK

module/Core/config/module.config.php

Spacing +41 added lines, -41 removed lines

@@ -15,7 +15,7 @@ 
 
 use Zend\ServiceManager\Factory\InvokableFactory;
 
-$doctrineConfig = include __DIR__ . '/doctrine.config.php';
+$doctrineConfig = include __DIR__.'/doctrine.config.php';
 
 
 return array(
@@ -23,7 +23,7 @@ 
     'doctrine' => $doctrineConfig,
 
     'options' => [
-        'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ],
+        'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'],
         ],
     
     'Core' => array(
@@ -43,7 +43,7 @@ 
                      'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/yawik.log',
+                         'stream' => __DIR__.'/../../../log/yawik.log',
                     ),
                  ),
             ),
@@ -54,7 +54,7 @@ 
                      'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/mails.log',
+                         'stream' => __DIR__.'/../../../log/mails.log',
                     ),
                  ),
             ),
@@ -71,7 +71,7 @@ 
         'mode' => true, // true = production|false = development|null = autodetect|IP address(es) csv/array
         'bar' => false, // bool = enabled|Toggle nette diagnostics bar.
         'strict' => true, // bool = cause immediate death|int = matched against error severity
-        'log' => __DIR__ . '/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files)
+        'log' => __DIR__.'/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files)
         'email' => null, // in production mode notifies the recipient
         'email_snooze' => 900 // interval for sending email in seconds
     ],
@@ -198,17 +198,17 @@ 
             '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',
             'mvctranslator' => \Zend\Mvc\I18n\TranslatorFactory::class,
             \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'],
+            'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class, 'factory'],
         ),
         'abstract_factories' => array(
             'Core\Factory\OptionsAbstractFactory',
@@ -230,17 +230,17 @@ 
         'translation_file_patterns' => array(
             [
                 'type' => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern' => '%s.mo',
             ],
             [
                 'type'     => 'phparray',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern' => 'Zend_Validate.%s.php',
             ],
             [
                 'type'     => 'phparray',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern' => 'Zend_Captcha.%s.php',
             ]
         ),
@@ -268,9 +268,9 @@ 
         ),
 	    'factories' => [
 	    	// @TODO: improve this factory
-		    'Core\Controller\Index' => [\Core\Controller\IndexController::class,'factory'],
-		    'Core/Admin' => [\Core\Controller\AdminController::class,'factory'],
-		    'Core\Controller\File'  => [\Core\Controller\FileController::class,'factory'],
+		    'Core\Controller\Index' => [\Core\Controller\IndexController::class, 'factory'],
+		    'Core/Admin' => [\Core\Controller\AdminController::class, 'factory'],
+		    'Core\Controller\File'  => [\Core\Controller\FileController::class, 'factory'],
 	    ],
         'abstract_factories' => [
 	        \Core\Factory\Controller\LazyControllerFactory::class
@@ -285,9 +285,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'],
         ),
         'invokables' => array(
             'Core/FileSender' => 'Core\Controller\Plugin\FileSender',
@@ -317,32 +317,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(

module/Core/Module.php

Spacing +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
     public function getConsoleBanner(Console $console)
     {
         $version = `git describe 2>/dev/null`;
-        $name = 'YAWIK ' . trim($version);
+        $name = 'YAWIK '.trim($version);
         $width = $console->getWidth();
         return sprintf(
             "==%1\$s==\n%2\$s%3\$s\n**%1\$s**\n",
@@ -111,8 +111,8 @@ 
 
         $eventManager->attach(
             MvcEvent::EVENT_DISPATCH_ERROR,
-            function ($event) {
-            	if($event instanceof MvcEvent){
+            function($event) {
+            	if ($event instanceof MvcEvent) {
 		            $application = $event->getApplication();
 		            
 		            if ($application::ERROR_EXCEPTION == $event->getError()) {
@@ -127,7 +127,7 @@ 
         );
         $eventManager->attach(
             MvcEvent::EVENT_DISPATCH,
-            function ($event) use ($eventManager) {
+            function($event) use ($eventManager) {
                 $eventManager->trigger('postDispatch', $event);
             },
             -150
@@ -142,7 +142,7 @@ 
      */
     public function getConfig()
     {
-        $config = include __DIR__ . '/config/module.config.php';
+        $config = include __DIR__.'/config/module.config.php';
         return $config;
     }
 
@@ -155,13 +155,13 @@ 
     {
         return array(
             'Zend\Loader\ClassMapAutoloader' => [
-                __DIR__ . '/src/autoload_classmap.php'
+                __DIR__.'/src/autoload_classmap.php'
             ],
             'Zend\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
-                    'CoreTest' => __DIR__ . '/test/' . 'CoreTest',
-                    'CoreTestUtils' => __DIR__ . '/test/CoreTestUtils',
+                    __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__,
+                    'CoreTest' => __DIR__.'/test/'.'CoreTest',
+                    'CoreTestUtils' => __DIR__.'/test/CoreTestUtils',
                 ),
             ),
         );

module/Core/src/Core/Repository/AbstractRepository.php

Spacing +3 added lines, -3 removed lines

@@ -122,11 +122,11 @@ 
         return $this;
     }
 
-    public function remove($entity,$flush=false)
+    public function remove($entity, $flush = false)
     {
         $this->checkEntityType($entity);
         $this->dm->remove($entity);
-		if($flush){
+		if ($flush) {
 			$this->dm->flush($entity);
 		}
         return $this;
@@ -134,7 +134,7 @@ 
 
     protected function checkEntityType($entity)
     {
-        if ( !($entity instanceOf $this->entityPrototype) ) {
+        if (!($entity instanceOf $this->entityPrototype)) {
             throw new \InvalidArgumentException(sprintf(
                                                     'Entity must be of type %s but recieved %s instead',
                                                     get_class($this->entityPrototype),

module/Core/src/Core/Repository/DoctrineMongoODM/DocumentManagerFactory.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 class DocumentManagerFactory implements FactoryInterface
 {
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null) {
 		$container->setAllowOverride(true);
 		$container->setFactory('doctrine.configuration.odm_default', new ConfigurationFactory('odm_default'));
 		$container->setAllowOverride(false);

module/Core/src/Core/Repository/RepositoryServiceFactory.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 class RepositoryServiceFactory implements FactoryInterface
 {
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null) {
 		$dm      = $container->get('Core/DocumentManager');
 		$service = new RepositoryService($dm);
 		

module/Core/src/Core/Filter/XssFilterFactory.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 *
 	 * @return XssFilter
 	 */
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$htmlPurifier = new Filter\HTMLPurifierFilter();
 		$htmlPurifier->setConfig(array("Cache.SerializerPath" => "cache/HtmlPurifier"));

module/Core/src/Core/Entity/Tree/AbstractLeafs.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 {
     use EntityTrait, ClonePropertiesTrait;
 
-    private $cloneProperties = [ '!items' ];
+    private $cloneProperties = ['!items'];
 
     /**
      * The leafs.
@@ -86,7 +86,7 @@ 
         $values = [];
         /* @var NodeInterface $item */
         foreach ($this->getItems() as $item) {
-        	if(!is_null($item)){
+        	if (!is_null($item)) {
 		        $values[] = $item->getValueWithParents();
 	        }
         }
@@ -115,7 +115,7 @@ 
                 $parent = $nextParent;
             }
             $nameParts[] = $item->getName();
-            $items[]     = join(' | ' , $nameParts);
+            $items[]     = join(' | ', $nameParts);
 
         }
 

module/Core/src/Core/Entity/Hydrator/EntityHydratorFactory.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 {
     protected $hydrator;
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$this->hydrator = $this->getEntityHydrator();
 		$this->prepareHydrator();
@@ -37,7 +37,7 @@ 
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-		return $this($serviceLocator,EntityHydrator::class);
+		return $this($serviceLocator, EntityHydrator::class);
     }
 
     protected function prepareHydrator()

module/Core/src/Core/Entity/Hydrator/JsonEntityHydratorFactory.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 {
     protected $hydrator;
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$this->hydrator = new JsonEntityHydrator();
 		$entityHydrator = $this->getEntityHydrator();
@@ -39,7 +39,7 @@ 
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        return $this($serviceLocator,JsonEntityHydrator::class);
+        return $this($serviceLocator, JsonEntityHydrator::class);
     }
 
     protected function prepareHydrator() {