add error exceptions, rewrite parser to universal composer pac

Mihail
1 parent 37656b1f
Showing 12 changed files with 142 additions and 83 deletions Show diff stats
backend/components/parsers/CustomCsvParser.php
backend/components/parsers/ParserConfigurator.php
backend/components/parsers/ParserHandler.php
backend/models/UploadFileParsingForm.php
common/components/debug/CustomVarDamp.php → common/components/CustomVarDamp.php
composer.json
vendor/composer/autoload_psr4.php
vendor/yiisoft/extensions.php
backend/components/parsers/CsvParser.php → vendor/yiisoft/multiparser/CsvParser.php
vendor/yiisoft/multiparser/ParserConfigurator.php
vendor/yiisoft/multiparser/ParserHandler.php
backend/components/parsers/ParserInterface.php → vendor/yiisoft/multiparser/ParserInterface.php
@@ -9,7 +9,7 @@
 namespace backend\components\parsers;
  
  
-class CustomCsvParser extends CsvParser {
+class CustomCsvParser extends  \yii\multiparser\CsvParser {
  
     protected function readRow()
     {
-<?php
-/**
- * Created by PhpStorm.
- * User: Cibermag
- * Date: 04.09.2015
- * Time: 18:17
- */
-
-namespace backend\components\parsers;
-
-
-class ParserConfigurator {
-    public static function getConfiguration ()
-    {
-        return [
-            'class' => 'backend\components\parsers\CustomCsvParser',
-        //    'file' => $this->fileObject,
-            'auto_detect_first_line' => true,
-        ];
-    }
-
-}
 \ No newline at end of file
-<?php
-namespace backend\components\parsers;
-use common\components\debug\CustomVarDamp;
-
-use Yii;
-
-
-class ParserHandler {
-
-/** @var string */
-    private $filePath;
-
-    /** @var instance of SplFileObject */
-    private $fileObject;
-
-    /** @var string - extension of file $filePath */
-    private $extension;
-
-    /** @var string - extension of file $filePath */
-    private $mode;
-
-    /**
-     * @param string first line in file for parsing
-     */
-    public function __construct( $filePath, $mode  )
-    {
-        $this->filePath = $filePath;
-        $this->mode = $mode;
-
-        try {
-            $this->fileObject = new \SplFileObject( $this->filePath , 'r' );;
-        } catch (\ErrorException $e) {
-            Yii::warning("Ошибка открытия файла {$this->filePath}");
-        }
-
-        //preg_match( '/\.[^\.]+$/i',$filePath, $resultArray );
-        $this->extension = $this->fileObject->getExtension();
-    }
-
-    public function run(){
-
-            $parser = Yii::createObject( ParserConfigurator::getConfiguration() );
-            $parser->setup();
-            return $parser->read();
-    }
-}
-
@@ -3,7 +3,7 @@ namespace backend\models;
  
 use yii\base\Model;
 use yii\web\UploadedFile;
-use backend\components\parsers\ParserHandler;
+use yii\multiparser\ParserHandler;
 use Yii;
 use common\components\debug\CustomVarDamp;
  
@@ -51,7 +51,8 @@ class UploadFileParsingForm extends Model
     }
  
     public function readFile($filePath){
-        $parser = new ParserHandler( $filePath, $this );
+
+        $parser = new ParserHandler( $filePath );
         $data = $parser->run();
  
         if( !is_array($data) ){
@@ -5,7 +5,7 @@
  * Date: 27.08.2015
  * Time: 16:47
  */
-namespace common\components\debug;
+namespace common\components;
 use yii\helpers\BaseVarDumper;
  
 class CustomVarDamp extends BaseVarDumper  {
@@ -17,7 +17,8 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.6",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*"
+        "yiisoft/yii2-swiftmailer": "*",
+        "yiisoft/multiparser": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
@@ -7,6 +7,7 @@ $baseDir = dirname($vendorDir);
  
 return array(
     'yii\\swiftmailer\\' => array($vendorDir . '/yiisoft/yii2-swiftmailer'),
+    'yii\\multiparser\\' => array($vendorDir . '/yiisoft/multiparser'),
     'yii\\gii\\' => array($vendorDir . '/yiisoft/yii2-gii'),
     'yii\\faker\\' => array($vendorDir . '/yiisoft/yii2-faker'),
     'yii\\debug\\' => array($vendorDir . '/yiisoft/yii2-debug'),
@@ -12,6 +12,15 @@ return array (
       '@yii/swiftmailer' => $vendorDir . '/yiisoft/yii2-swiftmailer',
     ),
   ),
+    'yiisoft/yii2-multiparser' =>
+  array (
+    'name' => 'yiisoft/multiparser',
+    'version' => '1.0',
+    'alias' =>
+    array (
+      '@yii/multiparser' => $vendorDir . '/yiisoft/multiparser',
+    ),
+  ),
   'yiisoft/yii2-codeception' => 
   array (
     'name' => 'yiisoft/yii2-codeception',
@@ -2,14 +2,9 @@
 /**
  
  */
-//@ todo add exceptions
-namespace backend\components\parsers;
+namespace yii\multiparser;
  
  
-use Yii;
-use yii\base\ErrorException;
-use common\components\debug\CustomVarDamp;
-
 class CsvParser implements ParserInterface
 {
  
@@ -112,8 +107,7 @@ class CsvParser implements ParserInterface
  
                     if (count($this->keys) !== count($row)) {
 //
-                        Yii::warning("Invalid columns detected on line #$current_line .");
-                        return $return;
+                        throw new \ErrorException( "Invalid columns detected on line # {$current_line}", 0, 1, $this->file->getBasename(), $current_line);
                     }
  
                     $return[] = array_combine($this->keys, $row);
+<?php
+namespace yii\multiparser;
+
+class ParserConfigurator
+{
+
+    private static $configuration = [
+        'csv' =>
+            ['web' =>
+                ['class' => 'backend\components\parsers\CustomCsvParser',
+                    'auto_detect_first_line' => true,]]];
+
+
+    public static function getConfiguration($extension, $mode)
+    {
+        if (!isset( self::$configuration[$extension] )){
+            throw new \ErrorException( "Parser do not maintain file with extension  {$extension}");
+        }
+        if (!isset( self::$configuration[$extension][$mode] )){
+            throw new \ErrorException( "Parser configurator do not have settings for {$mode} mode");
+        }
+
+        return self::$configuration[$extension][$mode];
+    }
+
+}
 \ No newline at end of file
+<?php
+
+namespace yii\multiparser;
+
+use Yii;
+
+class ParserHandler
+{
+
+    const DEFAULT_MODE = 'web';
+    /** @var string */
+    protected $filePath;
+
+    /** @var string */
+    protected $configuration;
+
+    /** @var instance of SplFileObject */
+    protected $fileObject;
+
+    /** @var string - extension of file $filePath */
+    protected $extension;
+
+    /** @var string - extension of file $filePath */
+    protected $mode;
+
+    /** @var string - extension of file $filePath */
+    protected $options;
+
+    /**
+     * @param string first line in file for parsing
+     */
+    public function __construct($filePath,  $options = [])
+    {
+        $this->filePath = $filePath;
+        if (isset($options['mode'])) {
+
+            $this->mode = $options['mode'];
+            unset($options['mode']);
+
+        } else {
+
+            $this->mode = self::DEFAULT_MODE;
+
+        }
+
+        $this->options = $options;
+
+        try {
+            $this->fileObject = new \SplFileObject($this->filePath, 'r');
+        } catch (\ErrorException $e) {
+            //  Yii::warning("Ошибка открытия файла {$this->filePath}");
+            echo "Ошибка открытия файла {$this->filePath}";
+            return [];
+        }
+
+        $options['file'] = $this->fileObject;
+        $this->extension = $this->fileObject->getExtension();
+
+        try {
+            $this->configuration = ParserConfigurator::getConfiguration($this->extension, $this->mode);
+            $this->configuration = array_merge($this->configuration, $options);
+
+        } catch (\ErrorException $e) {
+            echo $e->getMessage();
+            return [];
+        }
+
+    }
+
+    public function run()
+    {
+
+        $result = [];
+        // @todo - rewrite to universal manner
+       // \common\components\CustomVarDamp::dumpAndDie($this);
+        if (count($this->configuration)) {
+            $parser = Yii::createObject($this->configuration);
+
+            try {
+
+                $parser->setup();
+                $result = $parser->read();
+
+            } catch (\ErrorException $e) {
+
+                echo $e->getMessage();
+
+            }
+
+        }
+
+        return $result;
+    }
+}
+
@@ -6,10 +6,11 @@
  * Time: 18:25
  */
  
-namespace backend\components\parsers;
+namespace yii\multiparser;
  
  
 interface  ParserInterface {
+
     public  function setup();
  
     public  function read();