Fixing files & handlers classes

Author: steevenz

src/Abstracts/AbstractFile.php

@@ -14,6 +14,7 @@
 
 // ------------------------------------------------------------------------
 
+use O2System\Filesystem\File;
 use O2System\Psr\Patterns\AbstractDataStoragePattern;
 
 /**
@@ -23,13 +24,7 @@
  */
 abstract class AbstractFile extends AbstractDataStoragePattern
 {
-    /**
-     * AbstractFile::$filePath
-     *
-     * Path to the file.
-     *
-     * @var string
-     */
+    protected $fileExtension;
     protected $filePath;
 
     // ------------------------------------------------------------------------
@@ -59,6 +54,10 @@ final public function createFile( $filePath )
     {
         $this->filePath = $filePath;
 
+        if( pathinfo( $this->filePath, PATHINFO_EXTENSION) === '') {
+            $this->filePath .= $this->fileExtension;
+        }
+
         return $this;
     }
 

src/Config/Mimes.php

@@ -15,7 +15,7 @@
 | MIME TYPES
 | -------------------------------------------------------------------
 | This file contains an array of mime types. It is used by the
-| Upload class to help identify allowed file types.
+| Uploader class to help identify allowed file types.
 |
 */
 return [

src/File.php

@@ -23,6 +23,16 @@
  */
 class File extends SplFileInfo
 {
+    private $filePath;
+
+    public function __construct( $filePath = null )
+    {
+        if ( isset( $filePath ) ) {
+            $this->filePath = $filePath;
+            parent::__construct( $filePath );
+        }
+    }
+
     /**
      * File::setGroup
      *
@@ -297,6 +307,28 @@ public function read( $useIncludePath = false, $context = null )
 
     // ------------------------------------------------------------------------
 
+    public function create( $filePath = null, $mode = 'wb' )
+    {
+        $filePath = isset( $filePath ) ? $filePath : $this->filePath;
+        $dir = dirname( $filePath );
+
+        if ( ! is_writable( $dir ) ) {
+            if ( ! file_exists( $dir ) ) {
+                mkdir( $dir, 0777, true );
+            }
+        }
+
+        if ( ! $fp = @fopen( $filePath, $mode ) ) {
+            return false;
+        }
+
+        parent::__construct( $filePath );
+
+        return $fp;
+    }
+
+    // ------------------------------------------------------------------------
+
     /**
      * File::write
      *
@@ -307,24 +339,24 @@ public function read( $useIncludePath = false, $context = null )
      *
      * @return bool
      */
-    public function write( $contents, $mode = 'wb' )
+    public function write( $filePath, $contents, $mode = 'wb' )
     {
-        if ( ! $fp = @fopen( $this->getRealPath(), $mode ) ) {
-            return false;
-        }
+        if ( false !== ( $fp = $this->create( $filePath, $mode ) ) ) {
+            flock( $fp, LOCK_EX );
 
-        flock( $fp, LOCK_EX );
-
-        for ( $result = $written = 0, $length = strlen( $contents ); $written < $length; $written += $result ) {
-            if ( ( $result = fwrite( $fp, substr( $contents, $written ) ) ) === false ) {
-                break;
+            for ( $result = $written = 0, $length = strlen( $contents ); $written < $length; $written += $result ) {
+                if ( ( $result = fwrite( $fp, substr( $contents, $written ) ) ) === false ) {
+                    break;
+                }
             }
-        }
 
-        flock( $fp, LOCK_UN );
-        fclose( $fp );
+            flock( $fp, LOCK_UN );
+            fclose( $fp );
 
-        return is_int( $result );
+            return is_int( $result );
+        }
+
+        return false;
     }
 
     // ------------------------------------------------------------------------

src/Files/CsvFile.php

@@ -15,6 +15,7 @@
 // ------------------------------------------------------------------------
 
 use O2System\Filesystem\Abstracts\AbstractFile;
+use O2System\Filesystem\File;
 
 /**
  * Class CsvFile
@@ -23,6 +24,8 @@
  */
 class CsvFile extends AbstractFile
 {
+    protected $fileExtension = '.csv';
+
     /**
      * CsvFile::readFile
      *
@@ -67,9 +70,14 @@ public function writeFile( $filePath = null, array $options = [] )
             ? $this->filePath
             : $filePath;
 
-        $handle = fopen( $filePath, 'wb' );
+        $handle = ( new File() )->create( $filePath );
 
-        foreach ( $this->getArrayCopy() as $list ) {
+        foreach ( $this->getArrayCopy() as $key => $value ) {
+            if ( ! is_array( $value ) ) {
+                $list = [ $key, $value ];
+            } else {
+                $list = $value;
+            }
             fputcsv( $handle, $list );
         }
 

src/Files/IniFile.php

@@ -24,6 +24,8 @@
  */
 class IniFile extends AbstractFile
 {
+    protected $fileExtension = '.ini';
+
     /**
      * IniFile::readFile
      *
@@ -122,6 +124,6 @@ public function writeFile( $filePath = null, array $options = [] )
             }
         }
 
-        return ( new File( $filePath ) )->write( $content );
+        return ( new File() )->write( $filePath, $content );
     }
 }

src/Files/JsonFile.php

@@ -24,6 +24,8 @@
  */
 class JsonFile extends AbstractFile
 {
+    protected $fileExtension = '.json';
+
     /**
      * JsonFile::readFile
      *
@@ -66,7 +68,7 @@ public function writeFile( $filePath = null, array $options = [] )
             : $filePath;
 
         if ( $this->count() ) {
-            return ( new File( $filePath ) )->write( json_encode( $this->getArrayCopy(), JSON_PRETTY_PRINT ) );
+            return ( new File() )->write( $filePath, json_encode( $this->getArrayCopy(), JSON_PRETTY_PRINT ) );
         }
     }
 }

src/Files/XmlFile.php

@@ -24,6 +24,8 @@
  */
 class XmlFile extends AbstractFile
 {
+    protected $fileExtension = '.xml';
+
     /**
      * XmlFile::readFile
      *
@@ -67,10 +69,11 @@ public function writeFile( $filePath = null, array $options = [] )
         if ( $this->count() ) {
             $root = '<' . pathinfo( $filePath, PATHINFO_FILENAME ) . '/>';
 
+            $contents = $this->getArrayCopy();
             $xml = new \SimpleXMLElement( $root );
-            array_walk_recursive( $this->getArrayCopy(), [ $xml, 'addChild' ] );
+            array_walk_recursive( $contents, [ &$xml, 'addChild' ] );
 
-            return ( new File( $filePath ) )->write( $xml->asXML() );
+            return ( new File() )->write( $filePath, $xml->asXML() );
         }
     }
 }