php-resta / resta-core

src/resta/Support/Utils.php

Spacing +60 added lines, -60 removed lines

@@ -16,13 +16,13 @@ 
      * @param bool $shift

      * @return array

      */

-    public static function upperCase($argument,$shift=true)

+    public static function upperCase($argument, $shift = true)

     {

-        if($shift){

+        if ($shift) {

             array_shift($argument);

         }

 

-        return array_map(function($argument){

+        return array_map(function($argument) {

             return ucfirst($argument);

         },$argument);

     }

@@ -46,10 +46,10 @@ 
      */

     public static function strtolower($argument)

     {

-        if(!is_array($argument)){

+        if (!is_array($argument)) {

             return strtolower($argument);

         }

-        return array_map(function($argument){

+        return array_map(function($argument) {

             return strtolower($argument);

         },$argument);

     }

@@ -58,9 +58,9 @@ 
      * @param array $data

      * @return string

      */

-    public static function generatorNamespace($data=array())

+    public static function generatorNamespace($data = array())

     {

-        return str_replace('.php','',implode("\\",$data));

+        return str_replace('.php', '', implode("\\", $data));

     }

 

     /**

@@ -68,16 +68,16 @@ 
      * @param bool $extension

      * @return mixed

      */

-    public static function getPathFromNamespace($class,$extension=true)

+    public static function getPathFromNamespace($class, $extension = true)

     {

-        if($extension){

-            $default=root.'/'.str_replace("\\","/",$class).'.php';

+        if ($extension) {

+            $default = root.'/'.str_replace("\\", "/", $class).'.php';

         }

-        else{

-            $default=root.'/'.str_replace("\\","/",$class).'';

+        else {

+            $default = root.'/'.str_replace("\\", "/", $class).'';

         }

 

-        return str_replace("/App",'/src/app',$default);

+        return str_replace("/App", '/src/app', $default);

     }

 

     /**

@@ -94,9 +94,9 @@ 
      * @param $method

      * @return bool

      */

-    public static function existMethod($class,$method)

+    public static function existMethod($class, $method)

     {

-        return method_exists($class,$method);

+        return method_exists($class, $method);

     }

 

     /**

@@ -104,9 +104,9 @@ 
      * @param $second

      * @return bool

      */

-    public static function isArrayEqual($first,$second)

+    public static function isArrayEqual($first, $second)

     {

-        return (count( $first ) == count( $second ) && !array_diff( $first, $second ));

+        return (count($first)==count($second) && !array_diff($first, $second));

     }

 

     /**

@@ -123,17 +123,17 @@ 
      * @param bool $filename

      * @return array

      */

-    public static function glob($path,$filename=false)

+    public static function glob($path, $filename = false)

     {

         $configList = [];

 

         foreach (glob($path.'/*.php') as $config) {

 

-            $configArray=str_replace(".php","",explode("/",$config));

-            $configList[end($configArray)]=$config;

+            $configArray = str_replace(".php", "", explode("/", $config));

+            $configList[end($configArray)] = $config;

         }

 

-        if($filename===true){

+        if ($filename===true) {

             return array_keys($configList);

         }

 

@@ -162,7 +162,7 @@ 
      * @param string $seperator

      * @return mixed

      */

-    public static function getJustClassName($namespace,$seperator="\\")

+    public static function getJustClassName($namespace, $seperator = "\\")

     {

         $path = explode($seperator, $namespace);

         return array_pop($path);

@@ -173,23 +173,23 @@ 
      * @param array $param

      * @return bool

      */

-    public static function changeClass($class,$param=array())

+    public static function changeClass($class, $param = array())

     {

-        $executionPath=$class;

+        $executionPath = $class;

         $dt = fopen($executionPath, "r");

 

-        if($dt!==false){

+        if ($dt!==false) {

 

             $content = fread($dt, filesize($executionPath));

             fclose($dt);

 

-            foreach ($param as $key=>$value){

-                $content=str_replace($key,$value,$content);

+            foreach ($param as $key=>$value) {

+                $content = str_replace($key, $value, $content);

             }

 

             $forWrite = fopen($executionPath, "w");

 

-            if($forWrite!==false){

+            if ($forWrite!==false) {

                 fwrite($forWrite, $content);

                 fclose($forWrite);

 

@@ -205,9 +205,9 @@ 
      * @param $callback

      * @return mixed

      */

-    public static function returnCallback($data,$callback)

+    public static function returnCallback($data, $callback)

     {

-        return call_user_func_array($callback,[$data]);

+        return call_user_func_array($callback, [$data]);

     }

 

     /**

@@ -216,10 +216,10 @@ 
      */

     public static function getNamespace($namespace)

     {

-        $rootDelete=str_replace(root.''.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'','',$namespace);

+        $rootDelete = str_replace(root.''.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'', '', $namespace);

 

         return 'App\\'.self::generatorNamespace(

-                explode(''.DIRECTORY_SEPARATOR.'',$rootDelete)

+                explode(''.DIRECTORY_SEPARATOR.'', $rootDelete)

             );

 

     }

@@ -230,7 +230,7 @@ 
      */

     public static function callbackProcess($callback)

     {

-        return (is_callable($callback)) ? call_user_func_array($callback,[app()]) : $callback;

+        return (is_callable($callback)) ? call_user_func_array($callback, [app()]) : $callback;

     }

 

     /**

@@ -238,29 +238,29 @@ 
      * @param $array2

      * @return bool

      */

-    public static function array_diff_key_recursive ($array1, $array2)

+    public static function array_diff_key_recursive($array1, $array2)

     {

-        if(count($array1)!==count($array2)) self::$bool[]=false;

+        if (count($array1)!==count($array2)) self::$bool[] = false;

 

-        foreach ($array1 as $array1_key=>$array1_value){

+        foreach ($array1 as $array1_key=>$array1_value) {

 

-            if(!is_array($array1_value)){

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+            if (!is_array($array1_value)) {

+                if (!array_key_exists($array1_key, $array2)) self::$bool[] = false;

             }

-            else{

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+            else {

+                if (!array_key_exists($array1_key, $array2)) self::$bool[] = false;

 

-                if(!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key]=[];

+                if (!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key] = [];

 

-                if(isset($array1_value[0])) $array1_value=$array1_value[0];

+                if (isset($array1_value[0])) $array1_value = $array1_value[0];

 

-                if(isset($array2[$array1_key][0])) $array2[$array1_key]=$array2[$array1_key][0];

+                if (isset($array2[$array1_key][0])) $array2[$array1_key] = $array2[$array1_key][0];

 

-                self::array_diff_key_recursive($array1_value,$array2[$array1_key]);

+                self::array_diff_key_recursive($array1_value, $array2[$array1_key]);

             }

         }

 

-        if(in_array(false,self::$bool)){

+        if (in_array(false, self::$bool)) {

             return false;

         }

         return true;

@@ -272,7 +272,7 @@ 
      */

     public static function slashToBackSlash($data)

     {

-        return str_replace("/","\\",$data);

+        return str_replace("/", "\\", $data);

     }

 

     /**

@@ -282,11 +282,11 @@ 
      * @param null|string $key

      * @return mixed

      */

-    public static function trace($debug=0,$key=null)

+    public static function trace($debug = 0, $key = null)

     {

         $trace = debug_backtrace();

 

-        if($key===null){

+        if ($key===null) {

             return $trace[$debug] ?? null;

         }

 

@@ -298,7 +298,7 @@ 
      */

     public static function getServiceConf()

     {

-        if(property_exists(core(),'serviceConf') && defined('methodName')){

+        if (property_exists(core(), 'serviceConf') && defined('methodName')) {

             return core()->serviceConf;

         }

         return [];

@@ -309,18 +309,18 @@ 
      * @param null|string $reelPath

      * @return array

      */

-    public static function getPathWithPhpExtension($files,$reelPath=null)

+    public static function getPathWithPhpExtension($files, $reelPath = null)

     {

         $pathWithPhpList = [];

 

-        foreach ($files as $file){

+        foreach ($files as $file) {

 

-            if(preg_match('@(.*).php@is',$file,$pathWithPhp)){

+            if (preg_match('@(.*).php@is', $file, $pathWithPhp)) {

 

-                if($reelPath===null){

+                if ($reelPath===null) {

                     $pathWithPhpList[] = $pathWithPhp[0];

                 }

-                else{

+                else {

                     $pathWithPhpList[] = $reelPath.'/'.$pathWithPhp[0];

                 }

 

@@ -336,7 +336,7 @@ 
      */

     public static function resolverClass($class)

     {

-        if(self::isNamespaceExists($class)){

+        if (self::isNamespaceExists($class)) {

             return app()->resolve($class);

         }

 

@@ -348,8 +348,8 @@ 
      */

     public static function getRequestPathInfo()

     {

-        if(is_null(BootStaticManager::getRequestPath())){

-            return explode("/",request()->getPathInfo());

+        if (is_null(BootStaticManager::getRequestPath())) {

+            return explode("/", request()->getPathInfo());

         }

         return BootStaticManager::getRequestPath();

     }

@@ -359,13 +359,13 @@ 
      * @param null|string $remove

      * @return array

      */

-    public static function removeTrace($trace,$remove=null)

+    public static function removeTrace($trace, $remove = null)

     {

         $list = [];

 

-        foreach($trace as $key=>$item){

+        foreach ($trace as $key=>$item) {

 

-            if(isset($item['file']) && !preg_match('@'.$remove.'@',$item['file'])){

+            if (isset($item['file']) && !preg_match('@'.$remove.'@', $item['file'])) {

                 $list[$key] = $item;

             }

         }

src/resta/Support/FileSystem.php

Spacing +22 added lines, -22 removed lines

@@ -130,7 +130,7 @@ 
         $path = realpath($path) ?: $path;
         $tempPath = tempnam(dirname($path), basename($path));
         // Fix permissions of tempPath because `tempnam()` creates it with permissions set to 0600...
-        chmod($tempPath, 0777 - umask());
+        chmod($tempPath, 0777-umask());
         file_put_contents($tempPath, $content);
         rename($tempPath, $path);
     }
@@ -189,7 +189,7 @@ 
         $success = true;
         foreach ($paths as $path) {
             try {
-                if (! @unlink($path)) {
+                if (!@unlink($path)) {
                     $success = false;
                 }
             } catch (ErrorException $e) {
@@ -232,7 +232,7 @@ 
      */
     public function link($target, $link)
     {
-        if (! windows_os()) {
+        if (!windows_os()) {
             return symlink($target, $link);
         }
         $mode = $this->isDirectory($target) ? 'J' : 'H';
@@ -393,7 +393,7 @@ 
     public function files($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->depth(0)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->depth(0)->sortByName(),
             false
         );
     }
@@ -408,7 +408,7 @@ 
     public function allFiles($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->sortByName(),
             false
         );
     }
@@ -455,10 +455,10 @@ 
      */
     public function moveDirectory($from, $to, $overwrite = false)
     {
-        if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) {
+        if ($overwrite && $this->isDirectory($to) && !$this->deleteDirectory($to)) {
             return false;
         }
-        return @rename($from, $to) === true;
+        return @rename($from, $to)===true;
     }
 
     /**
@@ -471,14 +471,14 @@ 
      */
     public function copyDirectory($directory, $destination, $options = null)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $options = $options ?: FilesystemIterator::SKIP_DOTS;
         // If the destination directory does not actually exist, we will go ahead and
         // create it recursively, which just gets the destination prepared to copy
         // the files over. Once we make the directory we'll proceed the copying.
-        if (! $this->isDirectory($destination)) {
+        if (!$this->isDirectory($destination)) {
             $this->makeDirectory($destination, 0777, true);
         }
         $items = new FilesystemIterator($directory, $options);
@@ -489,7 +489,7 @@ 
             $target = $destination.'/'.$item->getBasename();
             if ($item->isDir()) {
                 $path = $item->getPathname();
-                if (! $this->copyDirectory($path, $target, $options)) {
+                if (!$this->copyDirectory($path, $target, $options)) {
                     return false;
                 }
             }
@@ -497,7 +497,7 @@ 
             // location and keep looping. If for some reason the copy fails we'll bail out
             // and return false, so the developer is aware that the copy process failed.
             else {
-                if (! $this->copy($item->getPathname(), $target)) {
+                if (!$this->copy($item->getPathname(), $target)) {
                     return false;
                 }
             }
@@ -516,7 +516,7 @@ 
      */
     public function deleteDirectory($directory, $preserve = false)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $items = new FilesystemIterator($directory);
@@ -524,7 +524,7 @@ 
             // If the item is a directory, we can just recurse into the function and
             // delete that sub-directory otherwise we'll just delete the file and
             // keep iterating through each file until the directory is cleaned.
-            if ($item->isDir() && ! $item->isLink()) {
+            if ($item->isDir() && !$item->isLink()) {
                 $this->deleteDirectory($item->getPathname());
             }
             // If the item is just a file, we can go ahead and delete it since we're
@@ -534,7 +534,7 @@ 
                 $this->delete($item->getPathname());
             }
         }
-        if (! $preserve) {
+        if (!$preserve) {
             @rmdir($directory);
         }
         return true;
@@ -549,7 +549,7 @@ 
     public function deleteDirectories($directory)
     {
         $allDirectories = $this->directories($directory);
-        if (! empty($allDirectories)) {
+        if (!empty($allDirectories)) {
             foreach ($allDirectories as $directoryName) {
                 $this->deleteDirectory($directoryName);
             }
@@ -580,17 +580,17 @@ 
      */
     public function getAllFilesInDirectory($dir, $recursive = true, $basedir = '', $include_dirs = false)
     {
-        if ($dir == '') {return array();} else {$results = array(); $subresults = array();}
-        if (!is_dir($dir)) {$dir = dirname($dir);} // so a files path can be sent
-        if ($basedir == '') {$basedir = realpath($dir).DIRECTORY_SEPARATOR;}
+        if ($dir=='') {return array(); } else {$results = array(); $subresults = array(); }
+        if (!is_dir($dir)) {$dir = dirname($dir); } // so a files path can be sent
+        if ($basedir=='') {$basedir = realpath($dir).DIRECTORY_SEPARATOR; }
 
         $files = scandir($dir);
-        foreach ($files as $key => $value){
-            if ( ($value != '.') && ($value != '..') ) {
+        foreach ($files as $key => $value) {
+            if (($value!='.') && ($value!='..')) {
                 $path = realpath($dir.DIRECTORY_SEPARATOR.$value);
                 if (is_dir($path)) {
                     // optionally include directories in file list
-                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path);}
+                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path); }
                     // optionally get file list for all subdirectories
                     if ($recursive) {
                         $subdirresults = self::getAllFilesInDirectory($path, $recursive, $basedir, $include_dirs);
@@ -603,7 +603,7 @@ 
             }
         }
         // merge the subarray to give the list of files then subdirectory files
-        if (count($subresults) > 0) {$results = array_merge($subresults, $results);}
+        if (count($subresults)>0) {$results = array_merge($subresults, $results); }
         return $results;
     }
 }
\ No newline at end of file

src/resta/Console/Source/Controller/Controller.php

Spacing +21 added lines, -21 removed lines

@@ -17,7 +17,7 @@ 
     /**

      * @var $type

      */

-    public $type='controller';

+    public $type = 'controller';

 

     /**

      * @var array

@@ -36,9 +36,9 @@ 
     /**

      * @var array

      */

-    protected $commandRule=[

+    protected $commandRule = [

         'create'    => ['controller'],

-        'rename'    => ['controller','rename'],

+        'rename'    => ['controller', 'rename'],

         'all'       => [],

     ];

 

@@ -54,7 +54,7 @@ 
 

         $this->argument['bundleName'] = $controller.''.StaticPathList::$controllerBundleName;

 

-        if(!file_exists(app()->path()->controller())){

+        if (!file_exists(app()->path()->controller())) {

             $this->directory['createController'] = app()->path()->controller();

         }

 

@@ -72,15 +72,15 @@ 
 

         $fullNamespaceForController             = $this->argument['controllerNamespace'].'\\'.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'];

 

-        $this->directory['routes']       = path()->route();

+        $this->directory['routes'] = path()->route();

 

         // with the directory operation,

         // we get to the service directory, which is called the controller.

         $this->file->makeDirectory($this);

 

-        if(isset($this->argument['resource']) && file_exists($this->directory['endpoint'])){

+        if (isset($this->argument['resource']) && file_exists($this->directory['endpoint'])) {

 

-            $this->touch['service/resource']   = $this->directory['resource'].''.DIRECTORY_SEPARATOR.''.$this->argument['resource'].'.php';

+            $this->touch['service/resource'] = $this->directory['resource'].''.DIRECTORY_SEPARATOR.''.$this->argument['resource'].'.php';

 

             $this->file->touch($this);

 

@@ -88,9 +88,9 @@ 
             echo $this->classical(' > Resource Controller called as "'.$this->argument['resource'].'" has been successfully created in the '.$this->directory['resource'].'');

 

         }

-        elseif(isset($this->argument['file']) && file_exists($this->directory['endpoint'])){

+        elseif (isset($this->argument['file']) && file_exists($this->directory['endpoint'])) {

 

-            $this->touch['service/controllerfile']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

+            $this->touch['service/controllerfile'] = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''.$this->argument['callClassPrefix'].'.php';

 

             $this->file->touch($this);

 

@@ -98,11 +98,11 @@ 
             echo $this->classical(' > Controller called as "'.$this->argument['file'].'" has been successfully created in the '.$this->directory['endpoint'].'');

 

         }

-        else{

+        else {

 

             // we process the processes related to file creation operations.

             // and then create files related to the touch method of the file object as it is in the directory process.

-            $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

+            $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'].'.php';

             $this->touch['service/route']           = $this->directory['routes'].''.DIRECTORY_SEPARATOR.''.$controller.'Route.php';

             $this->touch['service/resourceIndex']   = $this->directory['resource'].''.DIRECTORY_SEPARATOR.'index.html';

             $this->touch['service/app']             = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.'App.php';

@@ -111,9 +111,9 @@ 
             $this->touch['service/dummy']           = $this->directory['configuration'].''.DIRECTORY_SEPARATOR.'Dummy.yaml';

             $this->touch['service/doc']             = $this->directory['configuration'].''.DIRECTORY_SEPARATOR.'Doc.yaml';

             $this->touch['service/readme']          = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.'README.md';

-            $this->touch['service/policy']          = $this->directory['policy'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'Policy.php';

+            $this->touch['service/policy']          = $this->directory['policy'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'].'Policy.php';

 

-            $this->file->touch($this,[

+            $this->file->touch($this, [

                 'stub'=>'Controller_Create'

             ]);

 

@@ -141,24 +141,24 @@ 
     {

         $path = path()->controller().'/'.$this->argument['controller'].''.StaticPathList::$controllerBundleName;

 

-        if(file_exists($path)){

+        if (file_exists($path)) {

 

-            $newPathName = str_replace($this->argument['controller'],$this->argument['rename'],$path);

+            $newPathName = str_replace($this->argument['controller'], $this->argument['rename'], $path);

 

 

-            rename($path,$newPathName);

+            rename($path, $newPathName);

 

             $getAllFiles = files()->getAllFilesInDirectory($newPathName);

 

-            $getPathWithPhpExtensions = Utils::getPathWithPhpExtension($getAllFiles,$newPathName);

+            $getPathWithPhpExtensions = Utils::getPathWithPhpExtension($getAllFiles, $newPathName);

 

-            foreach ($getPathWithPhpExtensions as $getPathWithPhpExtension){

+            foreach ($getPathWithPhpExtensions as $getPathWithPhpExtension) {

 

-                $withoutFullPath = str_replace($newPathName,"",$getPathWithPhpExtension);

+                $withoutFullPath = str_replace($newPathName, "", $getPathWithPhpExtension);

 

                 $newName = $newPathName."".preg_replace("((.*)".$this->argument['controller'].")", "$1".$this->argument['rename'], $withoutFullPath);

 

-                rename($getPathWithPhpExtension,$newName);

+                rename($getPathWithPhpExtension, $newName);

 

                 Utils::changeClass($newName,

                     [

@@ -177,7 +177,7 @@ 
      */

     private function docUpdate()

     {

-        $docPath = $this->directory['configuration'] .'/Doc.yaml';

+        $docPath = $this->directory['configuration'].'/Doc.yaml';

 

         $doc = Utils::yaml($docPath);