FramyFramework / Framy

app/framework/Component/EventManager/EventProcessor.php

Spacing +7 added lines, -7 removed lines

@@ -33,10 +33,10 @@ 
      *
      * @return array
      */
-    public function process($eventListeners, Event $event, $resultType = null, $limit = null){
+    public function process($eventListeners, Event $event, $resultType = null, $limit = null) {
         $eventListeners = $this->orderByPriority($eventListeners);
 
-        $results = [];
+        $results = [ ];
 
         /* @var $eventListener EventListener */
         foreach ($eventListeners as $eventListener) {
@@ -55,17 +55,17 @@ 
                     $handler,
                     $method,
 
-                ], [$event]);
+                ], [ $event ]);
             }
 
             if ($this->isNull($resultType)
                 || (!$this->isNull($resultType)
                     && $this->isInstanceOf($result, $resultType))
-            ){
-                $results[] = $result;
+            ) {
+                $results[ ] = $result;
 
                 if ($limit === 1 && count($results) === 1) {
-                    return $results[0];
+                    return $results[ 0 ];
                 }
 
                 if (count($results) === $limit) {
@@ -96,7 +96,7 @@ 
          *
          * @return int
          */
-        $comparisonFunction = function ($a, $b) {
+        $comparisonFunction = function($a, $b) {
             if ($a->getPriority() == $b->getPriority()) {
                 // This will keep the order of same priority listeners in the order of subscribing
                 return 1;

app/framework/Component/Storage/Driver/Local/LocalHelper.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
         umask($umask);
 
         if (!$created) {
-            handle(new StorageException(StorageException::DIRECTORY_COULD_NOT_BE_CREATED, [$directory]));
+            handle(new StorageException(StorageException::DIRECTORY_COULD_NOT_BE_CREATED, [ $directory ]));
         }
     }
 
@@ -63,7 +63,7 @@ 
     {
         if (!is_dir($directory)) {
             if (!$create) {
-                handle(new StorageException(StorageException::DIRECTORY_DOES_NOT_EXIST, [$directory]));
+                handle(new StorageException(StorageException::DIRECTORY_DOES_NOT_EXIST, [ $directory ]));
             }
             $this->createDirectory($directory);
         }
@@ -116,11 +116,11 @@ 
                     }
                     break;
                 default:
-                    $tokens[] = $part;
+                    $tokens[ ] = $part;
             }
         }
 
-        return $prefix . implode('/', $tokens);
+        return $prefix.implode('/', $tokens);
     }
 
     /**
@@ -134,11 +134,11 @@ 
     {
         preg_match('|^(?P<prefix>([a-zA-Z]:)?/)|', $path, $matches);
 
-        if (empty($matches['prefix'])) {
+        if (empty($matches[ 'prefix' ])) {
             return '';
         }
 
-        return strtolower($matches['prefix']);
+        return strtolower($matches[ 'prefix' ]);
     }
 
     /**
@@ -154,6 +154,6 @@ 
     {
         $this->ensureDirectoryExists($directory, $create);
 
-        return $this->normalizeDirectoryPath($directory . '/' . $key);
+        return $this->normalizeDirectoryPath($directory.'/'.$key);
     }
 }

app/framework/Component/Storage/Driver/Local/LocalStorageDriver.php

Spacing +15 added lines, -15 removed lines

@@ -21,7 +21,7 @@ 
  *
  * @package app\framework\Component\Storage\Driver\Local
  */
-class LocalStorageDriver implements SizeAwareInterface,DriverInterface,AbsolutePathInterface,TouchableInterface,DirectoryAwareInterface
+class LocalStorageDriver implements SizeAwareInterface, DriverInterface, AbsolutePathInterface, TouchableInterface, DirectoryAwareInterface
 {
     /**
      * @var string
@@ -56,11 +56,11 @@ 
      */
     function __construct($config)
     {
-        if(is_array($config)){
+        if (is_array($config)) {
             $config = new ArrayObject($config);
         }
 
-        if(!$config instanceof ArrayObject){
+        if (!$config instanceof ArrayObject) {
             handle(new StorageException('Storage driver config must be an array or ArrayObject!'));
         }
 
@@ -112,7 +112,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)){
+        if ($this->keyExists($key)) {
             return filesize($this->buildPath($key));
         }
 
@@ -130,7 +130,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)){
+        if ($this->keyExists($key)) {
             return file_get_contents($this->buildPath($key));
         }
 
@@ -151,7 +151,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)) {
+        if ($this->keyExists($key)) {
             return file_put_contents($this->buildPath($key), $contents);
         }
 
@@ -174,13 +174,13 @@ 
         if ($key != '') {
             $key = ltrim($key, DS);
             $key = rtrim($key, DS);
-            $path = $this->directory . DS . $key;
+            $path = $this->directory.DS.$key;
         } else {
             $path = $this->directory;
         }
 
         if (!is_dir($path)) {
-            return [];
+            return [ ];
         }
 
         if ($recursive) {
@@ -196,22 +196,22 @@ 
             }
             $files = iterator_to_array($iterator);
         } else {
-            $files = [];
+            $files = [ ];
             $iterator = new \DirectoryIterator($path);
             foreach ($iterator as $fileinfo) {
                 $name = $fileinfo->getFilename();
                 if ($name == '.' || $name == '..') {
                     continue;
                 }
-                $files[] = $fileinfo->getPathname();
+                $files[ ] = $fileinfo->getPathname();
             }
         }
 
-        $keys = [];
+        $keys = [ ];
 
 
         foreach ($files as $file) {
-            $keys[] = $this->helper->getKey($file, $this->directory);
+            $keys[ ] = $this->helper->getKey($file, $this->directory);
         }
         sort($keys);
 
@@ -230,7 +230,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)){
+        if ($this->keyExists($key)) {
             return filectime($this->buildPath($key));
         }
 
@@ -268,7 +268,7 @@ 
     {
         $this->recentKey = $sourceKey;
 
-        if($this->keyExists($sourceKey)){
+        if ($this->keyExists($sourceKey)) {
             $targetPath = $this->buildPath($targetKey);
             $this->helper->ensureDirectoryExists(dirname($targetPath), true);
 
@@ -298,7 +298,7 @@ 
     {
         $key = str_replace('\\', '/', $key);
 
-        return $this->publicUrl . '/' . ltrim($key, "/");
+        return $this->publicUrl.'/'.ltrim($key, "/");
     }
 
     /**

app/framework/Component/Storage/StorageTrait.php

Indentation +23 added lines, -23 removed lines

@@ -6,27 +6,27 @@
  * @Author Marco Bier <mrfibunacci@gmail.com>
  */
 
- namespace app\framework\Component\Storage;
+    namespace app\framework\Component\Storage;
 
- /**
-  * A library of Storage functions
-  *
-  * @package app\framework\Component\Storage
-  */
- trait StorageTrait
- {
-     /**
-      * Get storage
-      *
-      * @param $storageName
-      * @return Storage
-      */
-     protected static function storage($storageName)
-     {
-         try {
-             return new Storage($storageName);
-         } catch(StorageException $e) {
-             handle($e);
-         }
-     }
- }
+    /**
+     * A library of Storage functions
+     *
+     * @package app\framework\Component\Storage
+     */
+    trait StorageTrait
+    {
+        /**
+         * Get storage
+         *
+         * @param $storageName
+         * @return Storage
+         */
+        protected static function storage($storageName)
+        {
+            try {
+                return new Storage($storageName);
+            } catch(StorageException $e) {
+                handle($e);
+            }
+        }
+    }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      {
          try {
              return new Storage($storageName);
-         } catch(StorageException $e) {
+         } catch (StorageException $e) {
              handle($e);
          }
      }

app/framework/Component/Storage/Storage.php

Spacing +3 added lines, -3 removed lines

@@ -156,7 +156,7 @@ 
      */
     public function isDirectory($key)
     {
-        if($this->supportsDirectories()){
+        if ($this->supportsDirectories()) {
             return true;
         }
 
@@ -174,7 +174,7 @@ 
      */
     public function touchKey($key)
     {
-        if($this->supportsTouching()){
+        if ($this->supportsTouching()) {
             return $this->getDriver()->touchKey($key);
         }
     }
@@ -192,7 +192,7 @@ 
         if ($this->supportsSize()) {
             return $this->getDriver()->getSize($key);
         }
-        handle(new StorageException(StorageException::DRIVER_CAN_NOT_ACCESS_SIZE, [get_class($this->getDriver())]));
+        handle(new StorageException(StorageException::DRIVER_CAN_NOT_ACCESS_SIZE, [ get_class($this->getDriver()) ]));
     }
 
     /**

app/framework/Component/Storage/Disk/Disk.php

Spacing +12 added lines, -12 removed lines

@@ -26,24 +26,24 @@ 
      */
     function __construct($diskName = null)
     {
-        if(strpos($diskName, '/') !== false) {
+        if (strpos($diskName, '/') !== false) {
             $this->disk = $this->validateDisk([
                 'root' => $diskName
             ]);
         } else {
-            if($this->isDisk($diskName)) {
+            if ($this->isDisk($diskName)) {
                 $this->disk = $this->validateDisk(
-                    Config::getInstance()->get("disks", "filesystem")[$diskName]
+                    Config::getInstance()->get("disks", "filesystem")[ $diskName ]
                 );
             } else {
                 handle(new StorageException(StorageException::DISK_NOT_FOUND));
             }
         }
 
-        if($this->isNull($this->disk['driver']))
-            $this->disk['driver'] = Config::getInstance()->get("default", "filesystem");
+        if ($this->isNull($this->disk[ 'driver' ]))
+            $this->disk[ 'driver' ] = Config::getInstance()->get("default", "filesystem");
 
-        if($this->disk['driver'] == 'local') {
+        if ($this->disk[ 'driver' ] == 'local') {
             $this->Driver = new LocalStorageDriver($this->disk);
         }
     }
@@ -56,7 +56,7 @@ 
      */
     public function isDisk($diskName)
     {
-        if(!$this->isNull(Config::getInstance()->get("disks", "filesystem")[$diskName])) {
+        if (!$this->isNull(Config::getInstance()->get("disks", "filesystem")[ $diskName ])) {
             return true;
         } else {
             return false;
@@ -83,16 +83,16 @@ 
      */
     public function getPath()
     {
-        return $this->disk['root'];
+        return $this->disk[ 'root' ];
     }
 
     private function validateDisk($conf)
     {
-        if(!array_key_exists('driver', $conf))
-            $conf['driver'] = null;
+        if (!array_key_exists('driver', $conf))
+            $conf[ 'driver' ] = null;
 
-        if(!array_key_exists('root', $conf))
-            $conf['root'] = null;
+        if (!array_key_exists('root', $conf))
+            $conf[ 'root' ] = null;
 
         return $conf;
     }

Braces +9 added lines, -6 removed lines

@@ -40,8 +40,9 @@ 
             }
         }
 
-        if($this->isNull($this->disk['driver']))
-            $this->disk['driver'] = Config::getInstance()->get("default", "filesystem");
+        if($this->isNull($this->disk['driver'])) {
+                    $this->disk['driver'] = Config::getInstance()->get("default", "filesystem");
+        }
 
         if($this->disk['driver'] == 'local') {
             $this->Driver = new LocalStorageDriver($this->disk);
@@ -88,11 +89,13 @@ 
 
     private function validateDisk($conf)
     {
-        if(!array_key_exists('driver', $conf))
-            $conf['driver'] = null;
+        if(!array_key_exists('driver', $conf)) {
+                    $conf['driver'] = null;
+        }
 
-        if(!array_key_exists('root', $conf))
-            $conf['root'] = null;
+        if(!array_key_exists('root', $conf)) {
+                    $conf['root'] = null;
+        }
 
         return $conf;
     }

app/framework/Component/Storage/Directory/Directory.php

Spacing +10 added lines, -10 removed lines

@@ -16,7 +16,7 @@ 
 
 class Directory implements DirectoryInterface, \IteratorAggregate
 {
-    use StdLibTrait,EventManagerTrait;
+    use StdLibTrait, EventManagerTrait;
 
     protected $key;
     protected $storage;
@@ -36,9 +36,9 @@ 
      */
     public function __construct($key, Storage $storage, $recursive = false, $filter = null)
     {
-        if(!$storage->supportsDirectories()){
+        if (!$storage->supportsDirectories()) {
             $driver = get_class($storage->getDriver());
-            handle(new StorageException(StorageException::DRIVER_CAN_NOT_WORK_WITH_DIRECTORIES, [$driver]));
+            handle(new StorageException(StorageException::DRIVER_CAN_NOT_WORK_WITH_DIRECTORIES, [ $driver ]));
         }
 
         $this->key = $key;
@@ -46,7 +46,7 @@ 
         $this->storage = $storage;
 
         if ($this->storage->keyExists($key) && !$this->storage->isDirectory($key)) {
-            handle(new StorageException(StorageException::DIRECTORY_OBJECT_CAN_NOT_READ_FILE_PATHS, [$key]));
+            handle(new StorageException(StorageException::DIRECTORY_OBJECT_CAN_NOT_READ_FILE_PATHS, [ $key ]));
         }
 
         $this->parseFilter($filter);
@@ -196,10 +196,10 @@ 
         $filter = $this->str($filter);
         if ($filter->startsWith('*')) {
             $filter->replace('.', '\.');
-            $this->regex = '/(\S+)' . $filter . '/';
+            $this->regex = '/(\S+)'.$filter.'/';
         } elseif ($filter->endsWith('*')) {
             $filter->replace('.', '\.');
-            $this->regex = '/' . $filter . '(\S+)/';
+            $this->regex = '/'.$filter.'(\S+)/';
         } else {
             $this->regex = $filter;
         }
@@ -214,17 +214,17 @@ 
             if ($this->regex) {
                 foreach ($keys as $k => $v) {
                     if (!preg_match($this->regex, $v)) {
-                        unset($keys[$k]);
+                        unset($keys[ $k ]);
                     }
                 }
             }
             // Instantiate files/directories
-            $this->items = [];
+            $this->items = [ ];
             foreach ($keys as $key) {
                 if ($this->storage->isDirectory($key)) {
-                    $this->items[$key] = new static($key, $this->storage);
+                    $this->items[ $key ] = new static($key, $this->storage);
                 } else {
-                    $this->items[$key] = new File($key, $this->storage);
+                    $this->items[ $key ] = new File($key, $this->storage);
                 }
             }
         }

app/framework/Component/Storage/File/File.php

Spacing +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
         $this->key     = $key;
 
         //make sure a file path is given
-        if($this->storage->keyExists($this->key) && $this->getStorage()->isDirectory($this->key)){
-            handle(new StorageException(StorageException::FILE_NOT_FOUND, [$key]));
+        if ($this->storage->keyExists($this->key) && $this->getStorage()->isDirectory($this->key)) {
+            handle(new StorageException(StorageException::FILE_NOT_FOUND, [ $key ]));
         }
     }
 

app/framework/Component/View/View.php

Braces +13 added lines, -10 removed lines

@@ -61,15 +61,17 @@ 
         $i = 0;
         foreach($View as $key => $value){
             if($key === "paths"){
-                if($i <= 0)
-                    $this->TemplateEngine->setTemplateDir($value);
-                else
-                    $this->TemplateEngine->addTemplateDir($value);
+                if($i <= 0) {
+                                    $this->TemplateEngine->setTemplateDir($value);
+                } else {
+                                    $this->TemplateEngine->addTemplateDir($value);
+                }
             } else {
-                if($i <= 0)
-                    $this->TemplateEngine->setTemplateDir($value->getAbsolutePath());
-                else
-                    $this->TemplateEngine->addTemplateDir($value->getAbsolutePath());
+                if($i <= 0) {
+                                    $this->TemplateEngine->setTemplateDir($value->getAbsolutePath());
+                } else {
+                                    $this->TemplateEngine->addTemplateDir($value->getAbsolutePath());
+                }
             }
             $i++;
         }
@@ -130,8 +132,9 @@ 
 
     private function getPathFromConfig($config)
     {
-        if(!is_array($config))
-            $config = array($config);
+        if(!is_array($config)) {
+                    $config = array($config);
+        }
 
         $View = false;
         foreach($config as $path){

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
      */
     private $TemplateEngine;
 
-    function __construct($view = null, $data = [])
+    function __construct($view = null, $data = [ ])
     {
         $this->view   = self::validateViewName($view);
         $this->data   = $data;
@@ -51,7 +51,7 @@ 
         $this->TemplateEngine = $TE->getInstance();
 
         // set Config path
-        $this->TemplateEngine->setCompileDir($this->getPathFromConfig(Config::getInstance()->get("compiled", "view"))[0]->getAbsolutePath());
+        $this->TemplateEngine->setCompileDir($this->getPathFromConfig(Config::getInstance()->get("compiled", "view"))[ 0 ]->getAbsolutePath());
 
         // get view paths
         $config = Config::getInstance()->get("paths", "view");
@@ -59,14 +59,14 @@ 
 
         // add view paths
         $i = 0;
-        foreach($View as $key => $value){
-            if($key === "paths"){
-                if($i <= 0)
+        foreach ($View as $key => $value) {
+            if ($key === "paths") {
+                if ($i <= 0)
                     $this->TemplateEngine->setTemplateDir($value);
                 else
                     $this->TemplateEngine->addTemplateDir($value);
             } else {
-                if($i <= 0)
+                if ($i <= 0)
                     $this->TemplateEngine->setTemplateDir($value->getAbsolutePath());
                 else
                     $this->TemplateEngine->addTemplateDir($value->getAbsolutePath());
@@ -87,12 +87,12 @@ 
             $this->assignData($this->data);
 
             $expView = explode(":", $this->view);
-            if(!array_key_exists(1, $expView)) {
+            if (!array_key_exists(1, $expView)) {
                 $this->TemplateEngine->display($this->view);
-            } elseif($expView[0] == "fetch") {
-                return $this->TemplateEngine->fetch(self::validateViewName($expView[1]));
+            } elseif ($expView[ 0 ] == "fetch") {
+                return $this->TemplateEngine->fetch(self::validateViewName($expView[ 1 ]));
             }
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             handle($e);
         }
     }
@@ -100,10 +100,10 @@ 
     private function assignData($data)
     {
         foreach ($data as $valueName => $dataSet) {
-            if(is_string($dataSet) && array_key_exists(1, explode(":", $dataSet))){
-                $viewName = explode(":", $dataSet)[1];
+            if (is_string($dataSet) && array_key_exists(1, explode(":", $dataSet))) {
+                $viewName = explode(":", $dataSet)[ 1 ];
 
-                switch (explode(":", $dataSet)[0]) {
+                switch (explode(":", $dataSet)[ 0 ]) {
                     case "fetch":
                         $this->TemplateEngine->assign($valueName, $this->TemplateEngine->fetch(self::validateViewName($viewName)));
                         break;
@@ -121,7 +121,7 @@ 
 
     private static function validateViewName($view)
     {
-        if(!array_key_exists(1, explode(".", $view))){
+        if (!array_key_exists(1, explode(".", $view))) {
             return $view.".tpl";
         } else {
             return $view;
@@ -130,16 +130,16 @@ 
 
     private function getPathFromConfig($config)
     {
-        if(!is_array($config))
+        if (!is_array($config))
             $config = array($config);
 
         $View = false;
-        foreach($config as $path){
+        foreach ($config as $path) {
             $path = explode(":", $path);
-            if($path[0] == "disk"){
-                $View[] = new Storage($path[1]);
+            if ($path[ 0 ] == "disk") {
+                $View[ ] = new Storage($path[ 1 ]);
             } else {
-                $View["paths"] = $path;
+                $View[ "paths" ] = $path;
             }
         }
         return $View;