o2system / framework

src/Http/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -50,16 +50,16 @@ 
         }
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         } elseif ($property === 'model') {
-            $get[ $property ] = models('controller');
+            $get[$property] = models('controller');
         } elseif ($property === 'services' || $property === 'libraries') {
-            $get[ $property ] = services();
+            $get[$property] = services();
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------

src/Http/Router.php

Spacing +11 added lines, -11 removed lines

@@ -49,7 +49,7 @@ 
             $this->handleExtensionRequest();
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -307,10 +307,10 @@ 
      */
     public function handleAppRequest(FrameworkModuleDataStructure $app)
     {
-        foreach(['','modules', 'plugins'] as $additionalSegment) {
-            $segments = [ $this->uri->segments->first() ];
+        foreach (['', 'modules', 'plugins'] as $additionalSegment) {
+            $segments = [$this->uri->segments->first()];
 
-            if( ! empty($additionalSegment)) {
+            if ( ! empty($additionalSegment)) {
                 array_unshift($segments, $additionalSegment);
             }
 
@@ -342,11 +342,11 @@ 
                 $uriRoutedSegments = array_diff($uriSegments,
                     array_slice($uriSegments, ($numOfUriSegments - $i)));
 
-                if(count($uriRoutedSegments)) {
-                    if($module instanceof FrameworkModuleDataStructure) {
+                if (count($uriRoutedSegments)) {
+                    if ($module instanceof FrameworkModuleDataStructure) {
                         $moduleSegments = $module->getSegments();
 
-                        if(count($moduleSegments)) {
+                        if (count($moduleSegments)) {
                             $uriRoutedSegments = array_merge($moduleSegments, $uriRoutedSegments);
                         }
                     }
@@ -438,7 +438,7 @@ 
                 if (class_exists($controllerClassName)) {
                     $this->addresses->any(
                         '/',
-                        function () use ($controllerClassName) {
+                        function() use ($controllerClassName) {
                             return new $controllerClassName();
                         }
                     );
@@ -453,7 +453,7 @@ 
             if (class_exists($controllerClassName)) {
                 $this->addresses->any(
                     '/',
-                    function () use ($controllerClassName) {
+                    function() use ($controllerClassName) {
                         return new $controllerClassName();
                     }
                 );
@@ -505,8 +505,8 @@ 
                 );
             } elseif (preg_match("/([a-zA-Z0-9\\\]+)(@)([a-zA-Z0-9\\\]+)/", $closure, $matches)) {
                 $this->setController(
-                    (new KernelControllerDataStructure($matches[ 1 ]))
-                        ->setRequestMethod($matches[ 3 ]),
+                    (new KernelControllerDataStructure($matches[1]))
+                        ->setRequestMethod($matches[3]),
                     $uriSegments
                 );
             } elseif (presenter()->theme->use === true) {

src/Cli/Commanders/Migrate.php

Spacing +36 added lines, -36 removed lines

@@ -330,7 +330,7 @@ 
                             'batch'     => $batch,
                         ];
 
-                        $this->insertOrUpdate($sets, ['filename' => $sets[ 'filename' ]]);
+                        $this->insertOrUpdate($sets, ['filename' => $sets['filename']]);
                     }
                 }
 
@@ -366,7 +366,7 @@ 
                     $timestamp = filemtime($filename);
                     preg_match('/\d{4}[-]?\d{2}[-]?\d{2}[-]?\d{2}[-]?\d{2}[-]?\d{2}/', $filename, $matches);
 
-                    $timestamp = count($matches) ? strtotime($matches[ 0 ]) : $timestamp;
+                    $timestamp = count($matches) ? strtotime($matches[0]) : $timestamp;
 
                     return date('Y-m-d H:i:s', $timestamp);
                 }
@@ -387,7 +387,7 @@ 
                     $version = 'v0.0.0';
                     preg_match('/v\d*[.]?\d*[.]\d*/', $filename, $matches);
 
-                    return count($matches) ? $matches[ 0 ] : $version;
+                    return count($matches) ? $matches[0] : $version;
                 }
 
                 // ------------------------------------------------------------------------
@@ -424,13 +424,13 @@ 
      */
     public function import()
     {
-        if( ! empty($this->optionSql)) {
-            $filePath = PATH_DATABASE . str_replace(['/','\\'], DIRECTORY_SEPARATOR, $this->optionSql);
+        if ( ! empty($this->optionSql)) {
+            $filePath = PATH_DATABASE . str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $this->optionSql);
 
-            if(is_file($filePath)) {
+            if (is_file($filePath)) {
                 $sqlStatement = file_get_contents($filePath);
 
-                if($this->model->db->query($sqlStatement)) {
+                if ($this->model->db->query($sqlStatement)) {
 
                 } else {
 
@@ -446,9 +446,9 @@ 
      */
     public function latest()
     {
-        if($result = $this->model->findWhere(['batch' => $this->model->getLatestBatch()])) {
-            if($result->count()) {
-                foreach($result as $row) {
+        if ($result = $this->model->findWhere(['batch' => $this->model->getLatestBatch()])) {
+            if ($result->count()) {
+                foreach ($result as $row) {
                     $this->run($row->filename, 'up');
                 }
             }
@@ -466,17 +466,17 @@ 
         $requestBatch = ($latestBatch - 1);
         $requestBatch = $requestBatch < 1 ? 1 : $requestBatch;
 
-        if( ! empty($this->optionBatch) ) {
+        if ( ! empty($this->optionBatch)) {
             $requestBatch = $this->optionBatch;
         }
 
         $batches = range($requestBatch, $latestBatch, 1);
         $batches = array_reverse($batches);
 
-        foreach($batches as $batch) {
-            if($result = $this->model->findWhere(['batch' => $batch])) {
-                if($result->count()) {
-                    foreach($result as $row) {
+        foreach ($batches as $batch) {
+            if ($result = $this->model->findWhere(['batch' => $batch])) {
+                if ($result->count()) {
+                    foreach ($result as $row) {
                         $this->run($row->filename, 'down');
                         $this->run($row->filename, 'up');
                     }
@@ -496,10 +496,10 @@ 
         $batches = range(1, $batch, 1);
         $batches = array_reverse($batches);
 
-        foreach($batches as $batch) {
-            if($result = $this->model->findWhere(['batch' => $batch])) {
-                if($result->count()) {
-                    foreach($result as $row) {
+        foreach ($batches as $batch) {
+            if ($result = $this->model->findWhere(['batch' => $batch])) {
+                if ($result->count()) {
+                    foreach ($result as $row) {
                         $this->run($row->filename, 'down');
                         $this->run($row->filename, 'up');
                     }
@@ -515,9 +515,9 @@ 
      */
     public function fresh()
     {
-        if($result = $this->model->findWhere(['batch' => 1])) {
-            if($result->count()) {
-                foreach($result as $row) {
+        if ($result = $this->model->findWhere(['batch' => 1])) {
+            if ($result->count()) {
+                foreach ($result as $row) {
                     $this->run($row->filename, 'up');
                 }
             }
@@ -538,13 +538,13 @@ 
     protected function run($filename, $method = 'up')
     {
         $filePaths = [
-            PATH_DATABASE . 'migrations' . DIRECTORY_SEPARATOR . str_replace(['/','\\'], DIRECTORY_SEPARATOR, $filename),
-            PATH_DATABASE . str_replace(['/','\\'], DIRECTORY_SEPARATOR, $filename)
+            PATH_DATABASE . 'migrations' . DIRECTORY_SEPARATOR . str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $filename),
+            PATH_DATABASE . str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $filename)
         ];
 
-        foreach($filePaths as $filePath) {
-            if(is_file($filePath)) {
-                if(pathinfo($filePath, PATHINFO_EXTENSION) == 'php') {
+        foreach ($filePaths as $filePath) {
+            if (is_file($filePath)) {
+                if (pathinfo($filePath, PATHINFO_EXTENSION) == 'php') {
                     require_once($filePath);
                     $filename = pathinfo($filePath, PATHINFO_FILENAME);
                     $filename = explode('_', $filename);
@@ -560,22 +560,22 @@ 
                             ->setNewLinesAfter(1)
                     );
 
-                    if(class_exists($className)) {
+                    if (class_exists($className)) {
                         $migration = new $className();
 
-                        if(method_exists($migration, $method)) {
+                        if (method_exists($migration, $method)) {
                             call_user_func([$migration, $method]);
 
                             output()->write(
                                 (new Format())
                                     ->setContextualClass(Format::SUCCESS)
-                                    ->setString(language()->getLine('CLI_MIGRATION_RUN_'.strtoupper($method).'_SUCCESS', [$filename]))
+                                    ->setString(language()->getLine('CLI_MIGRATION_RUN_' . strtoupper($method) . '_SUCCESS', [$filename]))
                                     ->setNewLinesAfter(1)
                             );
 
-                            if($method === 'up') {
-                                if(method_exists($migration, 'seed')) {
-                                    if($this->optionSeed) {
+                            if ($method === 'up') {
+                                if (method_exists($migration, 'seed')) {
+                                    if ($this->optionSeed) {
                                         call_user_func([$migration, 'seed']);
 
                                         output()->write(
@@ -589,10 +589,10 @@ 
                             }
                         }
                     }
-                } elseif(pathinfo($filePath, PATHINFO_EXTENSION) == 'sql') {
+                } elseif (pathinfo($filePath, PATHINFO_EXTENSION) == 'sql') {
                     $sqlStatement = file_get_contents($filePath);
 
-                    if($this->model->db->query($sqlStatement)) {
+                    if ($this->model->db->query($sqlStatement)) {
                         output()->write(
                             (new Format())
                                 ->setContextualClass(Format::SUCCESS)
@@ -621,7 +621,7 @@ 
      */
     public function execute()
     {
-        if($this->optionFilename) {
+        if ($this->optionFilename) {
             $this->run($this->optionFilename);
         }
     }

src/Cli/Commanders/Make/Migration.php

Spacing +8 added lines, -8 removed lines

@@ -102,7 +102,7 @@ 
 
         $className = studlycase($this->optionFilename);
 
-        if(empty($this->optionFileVersion)) {
+        if (empty($this->optionFileVersion)) {
             $filename = date('YmdHis') . '_' . underscore($this->optionFilename);
         } else {
             $filename = $this->optionFileVersion . '_' . underscore($this->optionFilename);
@@ -110,7 +110,7 @@ 
 
         $filePath = PATH_DATABASE . 'migrations' . DIRECTORY_SEPARATOR;
 
-        if( ! empty($this->optionPath) ) {
+        if ( ! empty($this->optionPath)) {
             $filePath = $filePath . $this->optionPath;
         }
 
@@ -133,15 +133,15 @@ 
             exit(EXIT_ERROR);
         }
 
-        $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m');
-        $vars[ 'BASE_MIGRATION' ] = 'O2System\Framework\Models\Sql\Migration';
+        $vars['CREATE_DATETIME'] = date('d/m/Y H:m');
+        $vars['BASE_MIGRATION'] = 'O2System\Framework\Models\Sql\Migration';
 
-        if($this->optionNoSql) {
-            $vars[ 'BASE_MIGRATION' ] = 'O2System\Framework\Models\NoSql\Migration';
+        if ($this->optionNoSql) {
+            $vars['BASE_MIGRATION'] = 'O2System\Framework\Models\NoSql\Migration';
         }
 
-        $vars[ 'CLASS' ] = $className;
-        $vars[ 'FILEPATH' ] = $filePath;
+        $vars['CLASS'] = $className;
+        $vars['FILEPATH'] = $filePath;
 
         $phpTemplate = <<<PHPTEMPLATE
 <?php