cross-solution / YAWIK

module/Auth/src/Auth/Repository/User.php

Doc Comments +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
      * @throws Mapping\MappingException
      * @throws LockException
      * @throws UserDeactivatedException
-     * @return null | UserInterface
+     * @return null|UserInterface | UserInterface
      */
     public function find($id, $lockMode = \Doctrine\ODM\MongoDB\LockMode::NONE, $lockVersion = null, array $options = [])
     {
@@ -63,7 +63,7 @@ 
      * @param array $criteria
      * @param array $options
      * @throws UserDeactivatedException
-     * @return null | UserInterface
+     * @return null|UserInterface | UserInterface
      */
     public function findOneBy(array $criteria, array $options = [])
     {
@@ -92,7 +92,7 @@ 
      * Creates a User
      *
      * @see \Core\Repository\AbstractRepository::create()
-     * @return UserInterface
+     * @return \Core\Entity\EntityInterface
      */
     public function create(array $data = null, $persist=false)
     {
@@ -267,7 +267,7 @@ 
      * @param UserInterface $user
      * @param array $options
      * @throws UserDeactivatedException
-     * @return null | UserInterface
+     * @return null|UserInterface | UserInterface
      */
     protected function assertEntity(UserInterface $user = null, array $options)
     {

Spacing +6 added lines, -6 removed lines

@@ -94,7 +94,7 @@ 
      * @see \Core\Repository\AbstractRepository::create()
      * @return UserInterface
      */
-    public function create(array $data = null, $persist=false)
+    public function create(array $data = null, $persist = false)
     {
         $entity = parent::create($data);
         
@@ -116,7 +116,7 @@ 
      */
     public function findByProfileIdentifier($identifier, $provider, array $options = [])
     {
-        return $this->findOneBy(array('profiles.' . $provider . '.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
+        return $this->findOneBy(array('profiles.'.$provider.'.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
     }
     
     /**
@@ -133,7 +133,7 @@ 
         $qb->field('_id')->notEqual($curentUserId)
             ->addAnd(
                 $qb->expr()
-                    ->addOr($qb->expr()->field('profiles.' . $provider . '.auth.identifier' )->equals($identifier))
+                    ->addOr($qb->expr()->field('profiles.'.$provider.'.auth.identifier')->equals($identifier))
                     ->addOr($qb->expr()->field('profile.identifier')->equals($identifier))
             );
         
@@ -189,7 +189,7 @@ 
         return $this->findOneBy(
             array(
             '$or' => array(
-                array('login' => $identity . $suffix),
+                array('login' => $identity.$suffix),
                 array('info.email' => $identity)
             )
             )
@@ -238,10 +238,10 @@ 
     public function findByQuery($query)
     {
         $qb = $this->createQueryBuilder();
-        $parts  = explode(' ', trim($query));
+        $parts = explode(' ', trim($query));
         
         foreach ($parts as $q) {
-            $regex = new \MongoRegex('/^' . $query . '/i');
+            $regex = new \MongoRegex('/^'.$query.'/i');
             $qb->addOr($qb->expr()->field('info.firstName')->equals($regex));
             $qb->addOr($qb->expr()->field('info.lastName')->equals($regex));
             $qb->addOr($qb->expr()->field('info.email')->equals($regex));

module/Organizations/src/Organizations/Repository/Organization.php

Indentation +9 added lines, -9 removed lines

@@ -129,10 +129,10 @@ 
 //           )
 //        );
         $qb->addAnd($qb->expr()->field('user')->equals($userId))
-           ->addAnd(
-               $qb->expr()->addOr($qb->expr()->field('parent')->exists(false))
-                               ->addOr($qb->expr()->field('parent')->equals(null))
-           );
+            ->addAnd(
+                $qb->expr()->addOr($qb->expr()->field('parent')->exists(false))
+                                ->addOr($qb->expr()->field('parent')->equals(null))
+            );
 
         $q      = $qb->getQuery();
         $entity = $q->getSingleResult();
@@ -192,11 +192,11 @@ 
         return $c;
     }
 	
-	/**
-	 * @param array|null    $data
-	 * @param bool          $persist
-	 * @return \Organizations\Entity\Organization
-	 */
+    /**
+     * @param array|null    $data
+     * @param bool          $persist
+     * @return \Organizations\Entity\Organization
+     */
     public function create(array $data = null, $persist=false)
     {
         $entity = parent::create($data);

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 	 * @param bool          $persist
 	 * @return \Organizations\Entity\Organization
 	 */
-    public function create(array $data = null, $persist=false)
+    public function create(array $data = null, $persist = false)
     {
         $entity = parent::create($data);
         $entity->isDraft(true);

module/Install/src/Controller/Plugin/UserCreator.php

Spacing +2 added lines, -2 removed lines

@@ -80,9 +80,9 @@
         $repo->setEntityPrototype(new User());
 
         $result = true;
-        try{
+        try {
             $repo->store($user);
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             throw $e;
         }
         return $result;

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         $result = true;
         try{
             $repo->store($user);
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             throw $e;
         }
         return $result;

module/Install/src/Controller/Index.php

Spacing +4 added lines, -4 removed lines

@@ -114,13 +114,13 @@ 
 
         $data = $form->getData();
 
-        try{
+        try {
             $options = [
                 'connection' => $data['db_conn'],
             ];
-            $userOk = $this->plugin('Install/UserCreator',$options)->process($data['username'], $data['password'], $data['email']);
+            $userOk = $this->plugin('Install/UserCreator', $options)->process($data['username'], $data['password'], $data['email']);
             $ok = $this->plugin('Install/ConfigCreator')->process($data['db_conn'], $data['email']);
-        }catch (\Exception $exception){
+        } catch (\Exception $exception) {
             /* @TODO: provide a way to handle global error message */
             return $this->createJsonResponse([
                 'ok'        => false,
@@ -153,7 +153,7 @@ 
 	    parent::attachDefaultListeners();
 	
 	    $events = $this->getEventManager();
-	    $events->attach( MvcEvent::EVENT_DISPATCH, array( $this, 'preDispatch' ), 100 );
+	    $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'preDispatch'), 100);
     }
 
     /**

Braces +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
             ];
             $userOk = $this->plugin('Install/UserCreator',$options)->process($data['username'], $data['password'], $data['email']);
             $ok = $this->plugin('Install/ConfigCreator')->process($data['db_conn'], $data['email']);
-        }catch (\Exception $exception){
+        } catch (\Exception $exception){
             /* @TODO: provide a way to handle global error message */
             return $this->createJsonResponse([
                 'ok'        => false,

module/Install/src/Factory/Controller/Plugin/UserCreatorFactory.php

Spacing +4 added lines, -4 removed lines

@@ -50,9 +50,9 @@ 
 
         $config = $container->get('doctrine.documentmanager.odm_default')->getConfiguration();
         $config->setDefaultDB($database);
-        $dm = $this->createDocumentManager($options['connection'],$config);
+        $dm = $this->createDocumentManager($options['connection'], $config);
 
-        $plugin = new UserCreator($credentialFilter,$dm);
+        $plugin = new UserCreator($credentialFilter, $dm);
         return $plugin;
     }
 
@@ -64,10 +64,10 @@ 
      * @return DocumentManager
      * @codeCoverageIgnore
      */
-    public function createDocumentManager($connection,$config)
+    public function createDocumentManager($connection, $config)
     {
         $dbConn = new Connection($connection);
-        $dm = DocumentManager::create($dbConn,$config);
+        $dm = DocumentManager::create($dbConn, $config);
         return $dm;
     }
 }

module/Install/src/Validator/MongoDbConnection.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
             $this->error(self::NO_CONNECTION);
 
             return false;
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             $this->databaseError = $e->getMessage();
             $this->error(self::NO_CONNECTION);
             return false;

Braces +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
             $this->error(self::NO_CONNECTION);
 
             return false;
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $this->databaseError = $e->getMessage();
             $this->error(self::NO_CONNECTION);
             return false;

module/Core/src/Core/Controller/Plugin/Mail.php

Spacing +18 added lines, -18 removed lines

@@ -153,18 +153,18 @@ 
         $replyTo = $this->stringFromMailHeader($this->getReplyTo());
         
         return str_pad($template, 30)
-                . 'to: ' . str_pad($to, 50)
-                . 'cc: ' . str_pad($cc, 50)
-                . 'bcc: ' . str_pad($bcc, 50)
-                . 'from: ' . str_pad($from, 50)
-                . 'replyTo: ' . str_pad($replyTo, 50)
+                . 'to: '.str_pad($to, 50)
+                . 'cc: '.str_pad($cc, 50)
+                . 'bcc: '.str_pad($bcc, 50)
+                . 'from: '.str_pad($from, 50)
+                . 'replyTo: '.str_pad($replyTo, 50)
                 //. str_pad(implode(',', ArrayUtils::iteratorToArray($this->getSender())),50)
-                . 'subject: ' . str_pad($this->getSubject(), 50);
+                . 'subject: '.str_pad($this->getSubject(), 50);
     }
     
     public function template($template)
     {
-        $controller =  is_object($this->controller) ? get_class($this->controller):'null';
+        $controller = is_object($this->controller) ? get_class($this->controller) : 'null';
         
         $event = new Event();
         $eventManager = $this->eventManager;
@@ -181,11 +181,11 @@ 
         $controllerIdentifier = strtolower(substr($controller, 0, strpos($controller, '\\')));
         $viewResolver = $this->viewResolver;
                 
-        $templateHalf = 'mail/' . $template;
+        $templateHalf = 'mail/'.$template;
         $resource = $viewResolver->resolve($templateHalf);
         
         if (empty($resource)) {
-            $templateFull = $controllerIdentifier . '/mail/' . $template;
+            $templateFull = $controllerIdentifier.'/mail/'.$template;
             $resource = $viewResolver->resolve($templateFull);
         }
         
@@ -212,7 +212,7 @@ 
                     unset($__vars[$key]);
                 }
             }
-            unset($__vars['content'],$__vars['controllerIdentifier'],$__vars['controller'],$__vars['resource'],$__vars['template'],$__vars['viewResolver']);
+            unset($__vars['content'], $__vars['controllerIdentifier'], $__vars['controller'], $__vars['resource'], $__vars['template'], $__vars['viewResolver']);
             $this->config = $__vars;
         }
     }
@@ -237,20 +237,20 @@ 
         if (isset($this->config['from'])) {
             $from = $this->config['from'];
         } else {
-            $log->err('A from email address must be provided (Variable $from) in Template: ' . $template);
-            throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template);
+            $log->err('A from email address must be provided (Variable $from) in Template: '.$template);
+            throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: '.$template);
         }
         if (isset($this->config['fromName'])) {
             $fromName = $this->config['fromName'];
         } else {
-            $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template);
-            throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template);
+            $log->err('A from name must be provided (Variable $fromName) in Template: '.$template);
+            throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: '.$template);
         }
         if (isset($this->config['subject'])) {
             $subject = $this->config['subject'];
         } else {
-            $log->err('A subject must be provided (Variable $subject) in Template: ' . $template);
-            throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template);
+            $log->err('A subject must be provided (Variable $subject) in Template: '.$template);
+            throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: '.$template);
         }
         $this->setFrom($from, $fromName);
         $this->setSubject($subject);
@@ -271,7 +271,7 @@ 
             $erg = true;
             $log->info($this);
         } catch (\Exception $e) {
-            $log->err('Mail failure ' . $e->getMessage());
+            $log->err('Mail failure '.$e->getMessage());
         }
         return $erg;
     }
@@ -288,6 +288,6 @@ 
         $viewResolver   = $container->get('ViewResolver');
         $eventManager   = $container->get('EventManager');
         $moduleManager  = $container->get('ModuleManager');
-        return new static($mailLog,$viewResolver,$eventManager,$moduleManager);
+        return new static($mailLog, $viewResolver, $eventManager, $moduleManager);
     }
 }

module/Core/src/Core/Options/MailServiceOptions.php

Spacing +8 added lines, -8 removed lines

@@ -99,7 +99,7 @@ 
         return $this;
     }
 
-    public function getUsername(){
+    public function getUsername() {
         return $this->connectionConfig['username'];
     }
 
@@ -110,7 +110,7 @@ 
         return $this;
     }
 
-    public function getPassword(){
+    public function getPassword() {
         return $this->connectionConfig['password'];
     }
 
@@ -121,7 +121,7 @@ 
         return $this;
     }
 
-    public function getSsl(){
+    public function getSsl() {
         return $this->connectionConfig['ssl'];
     }
 
@@ -130,7 +130,7 @@ 
         return $this;
     }
 
-    public function getTransportClass(){
+    public function getTransportClass() {
         return $this->transportClass;
     }
 
@@ -139,7 +139,7 @@ 
      */
     public function getPath()
     {
-        if(is_null($this->path) || false == $this->path){
+        if (is_null($this->path) || false == $this->path) {
             $this->setPath(sys_get_temp_dir().'/yawik/mails');
         }
         return $this->path;
@@ -151,9 +151,9 @@ 
      */
     public function setPath($path)
     {
-        if(!is_dir($path) && false !== $path){
-            mkdir($path,0777,true);
-            chmod($path,0777);
+        if (!is_dir($path) && false !== $path) {
+            mkdir($path, 0777, true);
+            chmod($path, 0777);
         }
         $this->path = $path;
         return $this;

config/config.php

Spacing +7 added lines, -7 removed lines

@@ -13,15 +13,15 @@ 
 $env = getenv('APPLICATION_ENV') ?: 'production';
 
 $coreModules = include 'common.modules.php';
-if (!file_exists(__DIR__ . '/autoload/yawik.config.global.php')) {
-    $modules = array_merge($coreModules,[
+if (!file_exists(__DIR__.'/autoload/yawik.config.global.php')) {
+    $modules = array_merge($coreModules, [
         'Install',
         'Core',
         'Auth',
         'Jobs',
     ]);
 } else {
-    $modules = array_merge($coreModules,[
+    $modules = array_merge($coreModules, [
         'Core',
         'Auth',
         'Cv',
@@ -38,12 +38,12 @@ 
         // kann und über Server-Variablen oder ähnlichen steuern kann
         $allModules = False;
     }
-    foreach (glob(__DIR__ . '/autoload/*.module.php') as $moduleFile) {
+    foreach (glob(__DIR__.'/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) { return strcasecmp($elem,$remove); });
+                $remove = substr($addModule, 1);
+                $modules = array_filter($modules, function($elem) use ($remove) { return strcasecmp($elem, $remove); });
             }
             else {
                 if (!in_array($addModule, $modules)) {
@@ -96,7 +96,7 @@ 
     ),
 );
 
-$envConfigFile = __DIR__ . '/config.' . $env . '.php';
+$envConfigFile = __DIR__.'/config.'.$env.'.php';
 if (file_exists($envConfigFile)) {
     if (is_readable($envConfigFile)) {
         $envConfig = include $envConfigFile;