o2system / filesystem

src/System.php

Spacing +5 added lines, -5 removed lines

@@ -255,8 +255,8 @@ 
         $string = trim(shell_exec($cmd));
 
         if (preg_match_all('/([0-9a-f]{2}:){5}\w\w/i', $string, $matches)) {
-            if (isset($matches[ 0 ])) {
-                return reset($matches[ 0 ]); // get first mac address
+            if (isset($matches[0])) {
+                return reset($matches[0]); // get first mac address
             }
         } else {
             return implode(':', str_split(substr(md5('none'), 0, 12), 2));
@@ -278,7 +278,7 @@ 
     {
         $rs = sys_getloadavg();
         $interval = $interval >= 1 && 3 <= $interval ? $interval : 1;
-        $load = $rs[ $interval ];
+        $load = $rs[$interval];
 
         return round(($load * 100) / $this->getCpuCores(), 2);
     }
@@ -298,7 +298,7 @@ 
         if (is_file('/proc/cpuinfo')) {
             $cpuinfo = file_get_contents('/proc/cpuinfo');
             preg_match_all('/^processor/m', $cpuinfo, $matches);
-            $numCpus = count($matches[ 0 ]);
+            $numCpus = count($matches[0]);
         } else {
             if ('WIN' == strtoupper(substr(PHP_OS, 0, 3))) {
                 $process = @popen('wmic cpu get NumberOfCores', 'rb');
@@ -313,7 +313,7 @@ 
                     $output = stream_get_contents($process);
                     preg_match('/hw.ncpu: (\d+)/', $output, $matches);
                     if ($matches) {
-                        $numCpus = intval($matches[ 1 ][ 0 ]);
+                        $numCpus = intval($matches[1][0]);
                     }
                     pclose($process);
                 }

src/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * @param $className
  */
 spl_autoload_register(
-    function ($className) {
+    function($className) {
         if ($className === 'O2System\Filesystem') {
             require __DIR__ . DIRECTORY_SEPARATOR . 'File.php';
         } elseif (strpos($className, 'O2System\Filesystem\\') === false) {

src/File.php

Spacing +5 added lines, -5 removed lines

@@ -202,7 +202,7 @@ 
     public function show()

     {

         if ($mime = $this->getMime()) {

-            $mime = is_array($mime) ? $mime[ 0 ] : $mime;

+            $mime = is_array($mime) ? $mime[0] : $mime;

         } elseif (is_file($this->getRealPath())) {

             $mime = 'application/octet-stream';

         }

@@ -225,8 +225,8 @@ 
 

         $ETag = '"' . md5($filename) . '"';

 

-        if ( ! empty($_SERVER[ 'HTTP_IF_NONE_MATCH' ])

-            && $_SERVER[ 'HTTP_IF_NONE_MATCH' ] == $ETag

+        if ( ! empty($_SERVER['HTTP_IF_NONE_MATCH'])

+            && $_SERVER['HTTP_IF_NONE_MATCH'] == $ETag

         ) {

             header('HTTP/1.1 304 Not Modified');

             header('Content-Length: ' . $fileSize);

@@ -268,8 +268,8 @@ 
         $mimes = $this->getMimes();

         $ext = strtolower($this->getExtension());

 

-        if (isset($mimes[ $ext ])) {

-            return $mimes[ $ext ];

+        if (isset($mimes[$ext])) {

+            return $mimes[$ext];

         }

 

         return false;

src/Files/CsvFile.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         $result = [];

 

         if (false !== ($handle = fopen($filePath, 'r'))) {

-            while (false !== ($data = fgetcsv($handle, $options[ 'length' ], $options[ 'delimiter' ]))) {

+            while (false !== ($data = fgetcsv($handle, $options['length'], $options['delimiter']))) {

                 $result[] = fgetcsv($handle);

             }

         }

src/Files/IniFile.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
             $filePath,

             (empty($options)

                 ? true

-                : $options[ 'sections' ])

+                : $options['sections'])

         );

 

         $this->merge($items);

@@ -67,7 +67,7 @@ 
 

         $sections = (empty($options)

             ? true

-            : $options[ 'sections' ]);

+            : $options['sections']);

 

         $content = null;

 

src/Handlers/Ftp.php

Spacing +8 added lines, -8 removed lines

@@ -72,10 +72,10 @@ 
         $this->setConfig($config);

 

         // Prep the port

-        $this->config[ 'port' ] = empty($this->config[ 'port' ]) ? 21 : (int)$this->config[ 'port' ];

+        $this->config['port'] = empty($this->config['port']) ? 21 : (int)$this->config['port'];

 

         // Prep the hostname

-        $this->config[ 'hostname' ] = preg_replace('|.+?://|', '', $this->config[ 'hostname' ]);

+        $this->config['hostname'] = preg_replace('|.+?://|', '', $this->config['hostname']);

 

         language()

             ->addFilePath(str_replace('Handlers', '', __DIR__) . DIRECTORY_SEPARATOR)

@@ -94,7 +94,7 @@ 
      */

     public function connect()

     {

-        if (false === ($this->handle = @ftp_connect($this->config[ 'hostname' ], $this->config[ 'port' ]))) {

+        if (false === ($this->handle = @ftp_connect($this->config['hostname'], $this->config['port']))) {

             if ($this->debugMode === true) {

                 throw new RuntimeException('FTP_E_UNABLE_TO_CONNECT');

             }

@@ -104,7 +104,7 @@ 
             return false;

         }

 

-        if (false !== (@ftp_login($this->handle, $this->config[ 'username' ], $this->config[ 'password' ]))) {

+        if (false !== (@ftp_login($this->handle, $this->config['username'], $this->config['password']))) {

             if ($this->debugMode === true) {

                 throw new RuntimeException('FTP_E_UNABLE_TO_LOGIN');

             }

@@ -359,8 +359,8 @@ 
             for ($i = 0, $c = count($list); $i < $c; $i++) {

                 // If we can't delete the item it's probaly a directory,

                 // so we'll recursively call delete_dir()

-                if ( ! preg_match('#/\.\.?$#', $list[ $i ]) && ! @ftp_delete($this->handle, $list[ $i ])) {

-                    $this->deleteDir($list[ $i ]);

+                if ( ! preg_match('#/\.\.?$#', $list[$i]) && ! @ftp_delete($this->handle, $list[$i])) {

+                    $this->deleteDir($list[$i]);

                 }

             }

         }

@@ -433,9 +433,9 @@ 
 

             // Recursively read the local directory

             while (false !== ($file = readdir($fp))) {

-                if (is_dir($localPath . $file) && $file[ 0 ] !== '.') {

+                if (is_dir($localPath . $file) && $file[0] !== '.') {

                     $this->mirror($localPath . $file . '/', $remotePath . $file . '/');

-                } elseif ($file[ 0 ] !== '.') {

+                } elseif ($file[0] !== '.') {

                     // Get the file extension so we can se the upload type

                     $ext = $this->getExtension($file);

                     $mode = $this->getTransferMode($ext);

src/Handlers/Downloader.php

Spacing +13 added lines, -13 removed lines

@@ -191,7 +191,7 @@ 
             }
 
             $this->filesize = strlen($this->filedata);
-            $this->filemime = mime_content_type($this->fileinfo[ 'filename' ]);
+            $this->filemime = mime_content_type($this->fileinfo['filename']);
             $this->lastModified = time();
 
         } else {
@@ -201,9 +201,9 @@ 
         }
 
         // Range
-        if (isset($_SERVER[ 'HTTP_RANGE' ]) || isset($HTTP_SERVER_VARS[ 'HTTP_RANGE' ])) {
+        if (isset($_SERVER['HTTP_RANGE']) || isset($HTTP_SERVER_VARS['HTTP_RANGE'])) {
             $this->partialRequest = true;
-            $http_range = isset($_SERVER[ 'HTTP_RANGE' ]) ? $_SERVER[ 'HTTP_RANGE' ] : $HTTP_SERVER_VARS[ 'HTTP_RANGE' ];
+            $http_range = isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : $HTTP_SERVER_VARS['HTTP_RANGE'];
             if (stripos($http_range, 'bytes') === false) {
                 output()
                     ->withStatus(416, 'Requested Range Not Satisfiable')
@@ -212,8 +212,8 @@ 
 
             $range = substr($http_range, strlen('bytes='));
             $range = explode('-', $range, 3);
-            $this->seekStart = ($range[ 0 ] > 0 && $range[ 0 ] < $this->filesize - 1) ? $range[ 0 ] : 0;
-            $this->seekEnd = ($range[ 1 ] > 0 && $range[ 1 ] < $this->filesize && $range[ 1 ] > $this->seekStart) ? $range[ 1 ] : $this->filesize - 1;
+            $this->seekStart = ($range[0] > 0 && $range[0] < $this->filesize - 1) ? $range[0] : 0;
+            $this->seekEnd = ($range[1] > 0 && $range[1] < $this->filesize && $range[1] > $this->seekStart) ? $range[1] : $this->filesize - 1;
             $this->seekFileSize = $this->seekEnd - $this->seekStart + 1;
         } else {
             $this->partialRequest = false;
@@ -247,7 +247,7 @@ 
      */
     public function download($filename = null)
     {
-        $filename = isset($filename) ? $filename : $this->fileinfo[ 'basename' ];
+        $filename = isset($filename) ? $filename : $this->fileinfo['basename'];
 
         if ($this->partialRequest) {
             if ($this->resumeable) {
@@ -278,7 +278,7 @@ 
         // Work On Download Speed Limit
         if ($this->speedLimit) {
             // how many buffers ticks per second
-            $bufferTicks = 10;    //10
+            $bufferTicks = 10; //10
             // how long one buffering tick takes by micro second
             $bufferMicroTime = 150; // 100
             // Calculate sleep micro time after each tick
@@ -309,17 +309,17 @@ 
                 if ($downloadFileBytes > $this->bufferSize) {
                     // send buffer size
                     echo fread($this->filedata, $this->bufferSize); // this also will seek to after last read byte
-                    $downloaded += $this->bufferSize;    // updated downloaded
-                    $downloadFileBytes -= $this->bufferSize;    // update remaining bytes
+                    $downloaded += $this->bufferSize; // updated downloaded
+                    $downloadFileBytes -= $this->bufferSize; // update remaining bytes
                 } else {
                     // send required size
                     // this will happens when we reaches the end of the file normally we wll download remaining bytes
-                    echo fread($this->filedata, $downloadFileBytes);    // this also will seek to last reat
+                    echo fread($this->filedata, $downloadFileBytes); // this also will seek to last reat
 
-                    $downloaded += $downloadFileBytes;    // Add to downloaded
+                    $downloaded += $downloadFileBytes; // Add to downloaded
 
 
-                    $downloadFileBytes = 0;    // Here last bytes have been written
+                    $downloadFileBytes = 0; // Here last bytes have been written
                 }
                 // send to buffer
                 flush();
@@ -382,7 +382,7 @@ 
      */
     public function resumeable($status = true)
     {
-        $this->partialRequest = $this->resumeable = ( bool )$status;
+        $this->partialRequest = $this->resumeable = (bool)$status;
 
         return $this;
     }

src/Handlers/Uploader.php

Spacing +22 added lines, -22 removed lines

@@ -107,34 +107,34 @@ 
             throw new BadDependencyCallException('UPLOADER_E_FINFO_EXTENSION');
         }
 
-        if (isset($config[ 'path' ])) {
-            $config[ 'path' ] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $config[ 'path' ]);
+        if (isset($config['path'])) {
+            $config['path'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $config['path']);
 
-            if (is_dir($config[ 'path' ])) {
-                $this->path = $config[ 'path' ];
+            if (is_dir($config['path'])) {
+                $this->path = $config['path'];
             } elseif (defined('PATH_STORAGE')) {
-                if (is_dir($config[ 'path' ])) {
-                    $this->path = $config[ 'path' ];
+                if (is_dir($config['path'])) {
+                    $this->path = $config['path'];
                 } else {
-                    $this->path = PATH_STORAGE . str_replace(PATH_STORAGE, '', $config[ 'path' ]);
+                    $this->path = PATH_STORAGE . str_replace(PATH_STORAGE, '', $config['path']);
                 }
             } else {
-                $this->path = dirname($_SERVER[ 'SCRIPT_FILENAME' ]) . DIRECTORY_SEPARATOR . $config[ 'path' ];
+                $this->path = dirname($_SERVER['SCRIPT_FILENAME']) . DIRECTORY_SEPARATOR . $config['path'];
             }
         } elseif (defined('PATH_STORAGE')) {
             $this->path = PATH_STORAGE;
         } else {
-            $this->path = dirname($_SERVER[ 'SCRIPT_FILENAME' ]) . DIRECTORY_SEPARATOR . 'upload';
+            $this->path = dirname($_SERVER['SCRIPT_FILENAME']) . DIRECTORY_SEPARATOR . 'upload';
         }
 
         $this->path = rtrim($this->path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
-        if (isset($config[ 'allowedMimes' ])) {
-            $this->setAllowedMimes($config[ 'allowedMimes' ]);
+        if (isset($config['allowedMimes'])) {
+            $this->setAllowedMimes($config['allowedMimes']);
         }
 
-        if (isset($config[ 'allowedExtensions' ])) {
-            $this->setAllowedExtensions($config[ 'allowedExtensions' ]);
+        if (isset($config['allowedExtensions'])) {
+            $this->setAllowedExtensions($config['allowedExtensions']);
         }
 
         $this->uploadedFiles = new ArrayIterator();
@@ -206,7 +206,7 @@ 
                 $this->path = PATH_STORAGE . str_replace(PATH_STORAGE, '', $path);
             }
         } else {
-            $this->path = dirname($_SERVER[ 'SCRIPT_FILENAME' ]) . DIRECTORY_SEPARATOR . $path;
+            $this->path = dirname($_SERVER['SCRIPT_FILENAME']) . DIRECTORY_SEPARATOR . $path;
         }
     }
 
@@ -239,7 +239,7 @@ 
                 break;
         }
 
-        $this->allowedFileSize[ 'min' ] = (int)$fileSize;
+        $this->allowedFileSize['min'] = (int)$fileSize;
 
         return $this;
     }
@@ -273,7 +273,7 @@ 
                 break;
         }
 
-        $this->allowedFileSize[ 'max' ] = (int)$fileSize;
+        $this->allowedFileSize['max'] = (int)$fileSize;
 
         return $this;
     }
@@ -429,21 +429,21 @@ 
         }
 
         /* Validate min size */
-        if ($this->allowedFileSize[ 'min' ] > 0) {
-            if ($file->getSize() < $this->allowedFileSize[ 'min' ]) {
+        if ($this->allowedFileSize['min'] > 0) {
+            if ($file->getSize() < $this->allowedFileSize['min']) {
                 $this->errors[] = language()->getLine(
                     'UPLOADER_E_ALLOWED_MIN_FILESIZE',
-                    [$this->allowedFileSize[ 'min' ], $file->getSize()]
+                    [$this->allowedFileSize['min'], $file->getSize()]
                 );
             }
         }
 
         /* Validate max size */
-        if ($this->allowedFileSize[ 'max' ] > 0) {
-            if ($file->getSize() > $this->allowedFileSize[ 'max' ]) {
+        if ($this->allowedFileSize['max'] > 0) {
+            if ($file->getSize() > $this->allowedFileSize['max']) {
                 $this->errors[] = language()->getLine(
                     'UPLOADER_E_ALLOWED_MAX_FILESIZE',
-                    [$this->allowedFileSize[ 'max' ], $file->getSize()]
+                    [$this->allowedFileSize['max'], $file->getSize()]
                 );
             }
         }