diff --git a/backend/components/parsers/CustomCsvParser.php b/backend/components/parsers/CustomCsvParser.php index 5c45f7a..5674511 100644 --- a/backend/components/parsers/CustomCsvParser.php +++ b/backend/components/parsers/CustomCsvParser.php @@ -11,23 +11,20 @@ namespace backend\components\parsers; class CustomCsvParser extends \yii\multiparser\CsvParser { - //public $last_line = 10; + public $last_line = 10; //public $hasHeaderRow = true; // public $keys = ['first','second', 'third', 'forth', 'fifth']; - - - protected function readRow() + public function setupConverter() { - $row = parent::readRow(); - - if (is_array($row)) { - - $row = Encoder::encodeArray( Encoder::$in_charset, Encoder::$out_charset, $row ); + if ($this->hasHeaderRow) { + // если у файла есть заголовок, то в результате имеем ассоциативный массив + $this->converter_conf['hasKey'] = 1; } - return $row; + $this->converter = \Yii::createObject($this->converter_conf); } + } \ No newline at end of file diff --git a/backend/components/parsers/config.php b/backend/components/parsers/config.php new file mode 100644 index 0000000..6e14618 --- /dev/null +++ b/backend/components/parsers/config.php @@ -0,0 +1,46 @@ + + ['web' => + ['class' => 'backend\components\parsers\CustomCsvParser', + 'auto_detect_first_line' => true, + 'converter_conf' => ['class' => 'yii\multiparser\Converter', + 'configuration' => [ + "string" => 'DESCR' + ] + ,]], + + 'basic_column' => [ + Null => 'Пусто', + "BRAND" => 'Бренд', + "ARTICLE"=> 'Артикул', + "PRICE" => 'Цена', + "DESCR" => 'Наименование', + "BOX" => 'Колво', + "ADD_BOX"=> 'В пути', + "GROUP" => 'Группа RG' + ], + ], + 'xml' => + ['web' => + ['class' => 'yii\multiparser\XmlParser', + 'node' => 'Товар',], + + 'basic_column' => [ + "BRAND" => 'Производитель', + "ARTICLE"=> 'Код', + "PRICE" => 'Розница', + "DESCR" => 'Наименование', + "BOX" => 'Колво', + "ADD_BOX"=> 'Ожидаемое', + "GROUP" => 'Группа' + ], + ] + ]; + + +//[ +// "float" => 'PRICE', +// "integer" => ['BOX' , 'ADD_BOX' ], +// "prefix" => 'ARTICLE' +//] \ No newline at end of file diff --git a/backend/config/main.php b/backend/config/main.php index fcac464..386e300 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -5,6 +5,7 @@ $params = array_merge( require(__DIR__ . '/params.php'), require(__DIR__ . '/params-local.php') ); +$mp_configuration = require( __DIR__ . '/../components/parsers/config.php'); return [ 'id' => 'app-backend', @@ -41,6 +42,7 @@ return [ 'multiparser'=>[ 'class' => 'yii\multiparser\YiiMultiparser', + 'configuration' => $mp_configuration, ], ], diff --git a/backend/controllers/ParserController.php b/backend/controllers/ParserController.php index 310c228..eb6dab9 100644 --- a/backend/controllers/ParserController.php +++ b/backend/controllers/ParserController.php @@ -8,7 +8,7 @@ use yii\filters\VerbFilter; use backend\models\UploadFileParsingForm; use yii\web\UploadedFile; use yii\data\ArrayDataProvider; -use backend\components\parsers\DynamicFormHelper; +use yii\multiparser\DynamicFormHelper; use backend\components\parsers\CustomParserConfigurator; use common\components\CustomVarDamp; @@ -96,13 +96,14 @@ class ParserController extends BaseController ], ]); + // CustomVarDamp::dumpAndDie($data); $header_model = DynamicFormHelper::CreateDynamicModel( count( $data[0] ) ); - //CustomVarDamp::dumpAndDie($header_model); + // CustomVarDamp::dumpAndDie(Yii::$app->multiparser->getConfiguration('csv','basic_column')); return $this->render('results', ['model' => $data, 'header_model' => $header_model, - 'basic_column' => CustomParserConfigurator::$basic_column, + 'basic_column' => Yii::$app->multiparser->getConfiguration('csv','basic_column'), 'dataProvider' => $provider]); } @@ -113,12 +114,15 @@ public function actionWrite() $arr_attributes = Yii::$app->request->post()['DynamicModel']; $model = DynamicFormHelper::CreateDynamicModel( $arr_attributes ); foreach ($arr_attributes as $key => $value) { - $model->addRule($key, 'in', ['range' => array_keys( CustomParserConfigurator::$basic_column )]); + $model->addRule($key, 'in', ['range' => array_keys( Yii::$app->multiparser->getConfiguration('csv','basic_column') )]); } //CustomVarDamp::dumpAndDie($model); if ($model->validate()) { $arr = $model->toArray(); + $data = json_decode( Yii::$app->getCache()->get( 'parser_data' ),true ); + + // CustomVarDamp::dumpAndDie(DynamicFormHelper::CreateAssocArray($data, $arr)); CustomVarDamp::dumpAndDie($arr); } diff --git a/backend/models/UploadFileParsingForm.php b/backend/models/UploadFileParsingForm.php index 9377a59..ef94bc4 100644 --- a/backend/models/UploadFileParsingForm.php +++ b/backend/models/UploadFileParsingForm.php @@ -52,7 +52,6 @@ class UploadFileParsingForm extends Model public function readFile($filePath){ $data = Yii::$app->multiparser->parse($filePath); - // \common\components\CustomVarDamp::dumpAndDie($data); if( !is_array($data) ){ $data = ['No results']; } diff --git a/backend/views/parser/results.php b/backend/views/parser/results.php index 2f3c7d0..e0c6460 100644 --- a/backend/views/parser/results.php +++ b/backend/views/parser/results.php @@ -1,7 +1,7 @@ params['breadcrumbs'][] = $this->title; $form = ActiveForm::begin(['action' => 'write']); ?> - +
'btn btn-primary']) ?> diff --git a/backend/web/.htaccess b/backend/web/.htaccess new file mode 100644 index 0000000..fa96d7a --- /dev/null +++ b/backend/web/.htaccess @@ -0,0 +1,8 @@ +RewriteEngine on + +RewriteBase / + +RewriteCond %{REQUEST_FILENAME} !-d +RewriteCond %{REQUEST_FILENAME} !-f + +RewriteRule . index.php \ No newline at end of file diff --git a/common/components/CustomVarDamp.php b/common/components/CustomVarDamp.php index adb1aff..4d45831 100644 --- a/common/components/CustomVarDamp.php +++ b/common/components/CustomVarDamp.php @@ -17,10 +17,16 @@ class CustomVarDamp extends BaseVarDumper { echo ""; die; } - public static function dump($var, $depth = 10, $highlight = false) + public static function dump($var, $step = '', $depth = 10, $highlight = false) { echo "
";
+        if ($step) {
+            echo "-------------- {$step} -------------";
+        }
         echo static::dumpAsString($var, $depth, $highlight);
+        if ($step) {
+            echo "-------------- {$step} -------------";
+        }
         echo "
"; } diff --git a/common/components/debug/CustomVarDamp.php b/common/components/debug/CustomVarDamp.php new file mode 100644 index 0000000..76d1a19 --- /dev/null +++ b/common/components/debug/CustomVarDamp.php @@ -0,0 +1,20 @@ +"; + echo static::dumpAsString($var, $depth, $highlight); + echo ""; + die; + } +} \ No newline at end of file diff --git a/framework/core/Convert.php b/framework/core/Convert.php index 89a4367..bd1f645 100644 --- a/framework/core/Convert.php +++ b/framework/core/Convert.php @@ -166,63 +166,63 @@ class Convert { } /** - * Converts an XML string to a PHP array - * See http://phpsecurity.readthedocs.org/en/latest/Injection-Attacks.html#xml-external-entity-injection - * - * @uses recursiveXMLToArray() - * @param string $val - * @param boolean $disableDoctypes Disables the use of DOCTYPE, and will trigger an error if encountered. - * false by default. - * @param boolean $disableExternals Disables the loading of external entities. false by default. - * @return array - */ - public static function xml2array($val, $disableDoctypes = false, $disableExternals = false) { - // Check doctype - if($disableDoctypes && preg_match('/\<\!DOCTYPE.+]\>/', $val)) { - throw new InvalidArgumentException('XML Doctype parsing disabled'); - } + * Converts an XML string to a PHP array + * See http://phpsecurity.readthedocs.org/en/latest/Injection-Attacks.html#xml-external-entity-injection + * + * @uses recursiveXMLToArray() + * @param string $val + * @param boolean $disableDoctypes Disables the use of DOCTYPE, and will trigger an error if encountered. + * false by default. + * @param boolean $disableExternals Disables the loading of external entities. false by default. + * @return array + */ + public static function xml2array($val, $disableDoctypes = false, $disableExternals = false) { + // Check doctype + if($disableDoctypes && preg_match('/\<\!DOCTYPE.+]\>/', $val)) { + throw new InvalidArgumentException('XML Doctype parsing disabled'); + } - // Disable external entity loading - if($disableExternals) $oldVal = libxml_disable_entity_loader($disableExternals); - try { - $xml = new SimpleXMLElement($val); - $result = self::recursiveXMLToArray($xml); - } catch(Exception $ex) { - if($disableExternals) libxml_disable_entity_loader($oldVal); - throw $ex; - } - if($disableExternals) libxml_disable_entity_loader($oldVal); - return $result; - } + // Disable external entity loading + if($disableExternals) $oldVal = libxml_disable_entity_loader($disableExternals); + try { + $xml = new SimpleXMLElement($val); + $result = self::recursiveXMLToArray($xml); + } catch(Exception $ex) { + if($disableExternals) libxml_disable_entity_loader($oldVal); + throw $ex; + } + if($disableExternals) libxml_disable_entity_loader($oldVal); + return $result; + } - /** - * Convert a XML string to a PHP array recursively. Do not - * call this function directly, Please use {@link Convert::xml2array()} - * - * @param SimpleXMLElement - * - * @return mixed - */ - protected static function recursiveXMLToArray($xml) { - if(is_object($xml) && get_class($xml) == 'SimpleXMLElement') { - $attributes = $xml->attributes(); - foreach($attributes as $k => $v) { - if($v) $a[$k] = (string) $v; - } - $x = $xml; - $xml = get_object_vars($xml); - } - if(is_array($xml)) { - if(count($xml) == 0) return (string) $x; // for CDATA - foreach($xml as $key => $value) { - $r[$key] = self::recursiveXMLToArray($value); - } - if(isset($a)) $r['@'] = $a; // Attributes - return $r; - } - - return (string) $xml; - } + /** + * Convert a XML string to a PHP array recursively. Do not + * call this function directly, Please use {@link Convert::xml2array()} + * + * @param SimpleXMLElement + * + * @return mixed + */ + protected static function recursiveXMLToArray($xml) { + if(is_object($xml) && get_class($xml) == 'SimpleXMLElement') { + $attributes = $xml->attributes(); + foreach($attributes as $k => $v) { + if($v) $a[$k] = (string) $v; + } + $x = $xml; + $xml = get_object_vars($xml); + } + if(is_array($xml)) { + if(count($xml) == 0) return (string) $x; // for CDATA + foreach($xml as $key => $value) { + $r[$key] = self::recursiveXMLToArray($value); + } + if(isset($a)) $r['@'] = $a; // Attributes + return $r; + } + + return (string) $xml; + } /** * Create a link if the string is a valid URL diff --git a/frontend/web/.htaccess b/frontend/web/.htaccess new file mode 100644 index 0000000..35a2d28 --- /dev/null +++ b/frontend/web/.htaccess @@ -0,0 +1,8 @@ +RewriteEngine on +RewriteBase / +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d + +RewriteRule . index.php + +Options -Indexes \ No newline at end of file diff --git a/vendor/yiisoft/multiparser/Converter.php b/vendor/yiisoft/multiparser/Converter.php new file mode 100644 index 0000000..360e695 --- /dev/null +++ b/vendor/yiisoft/multiparser/Converter.php @@ -0,0 +1,148 @@ +configuration['hasKey'] ); + foreach ( $this->configuration as $key => $value ) { + + if ( $hasKey ){ + // у нас ассоциативный массив, и мы можем конвертировать каждое значение в отдельности + if ( is_array( $value ) ) { + foreach ($value as $sub_value) { + if (isset($arr[$sub_value])) { + // конвертируем только те ячейки которые сопоставлены в прочитанном массиве с колонками в конфигурационном файле + $result[$arr[$sub_value]] = self::$key( $arr[$sub_value] ); + } + + } + } else { + + if (isset($arr[$value])) { + // конвертируем только те ячейки которые сопоставлены в прочитанном массиве с колонками в конфигурационном файле + $result[$arr[$value]] = self::$key( $arr[$value] ); + } + + } + + } else { + // нет заголовка - мы можем конвертировать только строку в целом + $result = self::$key( $arr ); + } + + } + + return $result; + } + + + +} \ No newline at end of file diff --git a/vendor/yiisoft/multiparser/CsvParser.php b/vendor/yiisoft/multiparser/CsvParser.php index cde4650..51f284a 100644 --- a/vendor/yiisoft/multiparser/CsvParser.php +++ b/vendor/yiisoft/multiparser/CsvParser.php @@ -45,21 +45,45 @@ class CsvParser implements ParserInterface * используется при автоопределении первой строки*/ public $min_column_quantity = 5; + /** @var array - конфигурация конвертера значений */ + public $converter_conf = []; + /** @var array - конвертер созданный по конфигурации */ + public $converter = NULL; /** - метод устанвливает нужные настройки объекта SplFileObject, для работы с csv + * метод устанвливает нужные настройки объекта SplFileObject, для работы с csv */ public function setup() { $this->file->setCsvControl($this->delimiter); $this->file->setFlags(\SplFileObject::READ_CSV); $this->file->setFlags(\SplFileObject::SKIP_EMPTY); + if ($this->auto_detect_first_line) { $this->shiftToFirstValuableLine(); } + $this->setupConverter(); + + } + + /** + * устанавливает конвертер значений согласно конфигурационным настройкам + */ + public function setupConverter() + { + if (!count($this->converter_conf)) { + $this->converter = new Converter(); + if ($this->hasHeaderRow) { + // если у файла есть заголовок, то в результате имеем ассоциативный массив + $this->converter_conf['hasKey'] = 1; + } + $this->converter->configuration = $this->converter_conf; + + } } + /** * определяет первую значимую строку, * считывается файл пока в нем не встретится строка с непустыми колонками @@ -97,6 +121,7 @@ class CsvParser implements ParserInterface */ public function read() { + $return = []; $current_line = 0; @@ -104,7 +129,6 @@ class CsvParser implements ParserInterface while (($row = $this->readRow()) !== FALSE) { $current_line++; - if ($this->hasHeaderRow) { if ($this->keys === NULL) { $this->keys = array_values($row); @@ -112,14 +136,12 @@ class CsvParser implements ParserInterface if (count($this->keys) !== count($row)) { // - throw new \ErrorException( "Invalid columns detected on line # {$current_line}", 0, 1, $this->file->getBasename(), $current_line); + throw new \ErrorException("Invalid columns detected on line # {$current_line}", 0, 1, $this->file->getBasename(), $current_line); } $return[] = array_combine($this->keys, $row); } - } - else - { + } else { $return[] = $row; } // если у нас установлен лимит, при его достижении прекращаем парсинг @@ -134,7 +156,6 @@ class CsvParser implements ParserInterface } - protected function closeHandler() { $this->file = NULL; @@ -147,10 +168,16 @@ class CsvParser implements ParserInterface { $row = $this->file->fgetcsv(); - if (is_array($row) && $this->first_column) { + if (is_array($row)) { + // попытаемся конвертировать прочитанные занчения согдасно конфигурации котнвертера значений + // \common\components\CustomVarDamp::dump($row,1); + $row = $this->convert($row); + // \common\components\CustomVarDamp::dump($row,2); + if ($this->first_column) { - $row = array_slice($row, $this->first_column); + $row = array_slice($row, $this->first_column); + } } if (is_null($row)) $row = false; @@ -159,5 +186,25 @@ class CsvParser implements ParserInterface } + /** + * @param $arr + * @return mixed + * преобразовует значения прочитанного массива в нужные типы, согласно конфигурации конвертера + */ + protected function convert($arr) + { + $result = $arr; + $converter = $this->converter; + + if (!is_null($converter)) { + + $result = $converter->convertByConfiguration( $arr ); + + } + + return $result; + + } + } \ No newline at end of file diff --git a/vendor/yiisoft/multiparser/DynamicFormHelper.php b/vendor/yiisoft/multiparser/DynamicFormHelper.php new file mode 100644 index 0000000..ee5e36e --- /dev/null +++ b/vendor/yiisoft/multiparser/DynamicFormHelper.php @@ -0,0 +1,103 @@ + $i) { + $arr_keys[] = self::KEY_PREFIX . $i; + $i++; + } + array_flip($arr_keys); + + } + + $model = new DynamicModel($arr_keys); + + return $model; + } + + // @todo add comments + public static function CreateGridWithDropDownListHeader( $dataProvider, $form, $header_model, $arr_header_values ) + { + $columns_config = [['class' => SerialColumn::className()]]; + $i = 0; + foreach( $header_model as $key => $value ) { + + $columns_config[] = ['header' => $form->field($header_model, $key, ['inputOptions' => ['label' => '']])->dropDownList($arr_header_values), 'attribute' => $i]; + $i++; + } + $dynamic_grid_view = GridView::widget( ['dataProvider' => $dataProvider, + 'columns' => $columns_config ] ); + + return $dynamic_grid_view; + + } + + /** + * @param $value_arr - двумерный массив значений, которому нужно присвоить ключи + * @param $key_array - ключи для вложенного массива + * @return array - таблица с проименованными колонками + */ + public static function CreateAssocArray ($value_arr, $key_array) + { + // преобразуем массив ключей (обернем в массив), для передачи его в качестве параметра в анонимную функцию для array_map + // для этого увеличим размерность массива, что бы при каждом обходе массива $value_arr , функции был доступен исходный массив ключей + $key_array = array_fill( 0, count($value_arr), array_flip($key_array)); + + $result = array_map( + function ($value, $key_array) { + $res = $value; + foreach ($value as $key => $sub_value) { + if (isset($key_array[$key])) { + // если такой ключ в базовом массиве (массиве ключей) есть, то заменим новым, иначе просто удалим + $new_key = $key_array[$key]; + if( !array_key_exists( $new_key , $res ) ){ + $res[ $new_key ] = $res[$key]; + } + } + unset( $res[$key] ); + } + + return $res; + }, + $value_arr, $key_array); + return $result; + } + + +} \ No newline at end of file diff --git a/vendor/yiisoft/multiparser/Encoder.php b/vendor/yiisoft/multiparser/Encoder.php new file mode 100644 index 0000000..1565ef3 --- /dev/null +++ b/vendor/yiisoft/multiparser/Encoder.php @@ -0,0 +1,59 @@ + - ['web' => - ['class' => 'backend\components\parsers\CustomCsvParser', - 'auto_detect_first_line' => true,]]]; + protected static $configuration; - - public static function getConfiguration($extension, $mode) + public static function getConfiguration($extension, $parameter) { + self::setConfiguration(); + 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"); + if (!isset( self::$configuration[$extension][$parameter] )){ + throw new \ErrorException( "Parser configurator do not have settings for {$parameter} parameter"); } - return self::$configuration[$extension][$mode]; + return self::$configuration[$extension][$parameter]; } + protected static function setConfiguration() + { + + self::$configuration = require(__DIR__ . '/config.php'); + + } + + + } \ No newline at end of file diff --git a/vendor/yiisoft/multiparser/XmlParser.php b/vendor/yiisoft/multiparser/XmlParser.php new file mode 100644 index 0000000..9a736a5 --- /dev/null +++ b/vendor/yiisoft/multiparser/XmlParser.php @@ -0,0 +1,88 @@ +file; + $result = self::xml2array( $file->getPathname() ); + if ( isset($this->node) ) { + $result = $result[$this->node]; + } + + //\common\components\CustomVarDamp::dumpAndDie($result); + $result = DynamicFormHelper::CreateAssocArray($result, \Yii::$app->multiparser->getConfiguration('xml','basic_column')); + \common\components\CustomVarDamp::dumpAndDie($result); + } + + public function setup() + { + + + } + + + /** + * Converts an XML string to a PHP array + * + * @uses recursiveXMLToArray() + * @param string $file_path + * @return array + */ + protected static function xml2array( $file_path ) { + + try { + $xml = new \SimpleXMLElement( $file_path, 0, true ); + //\common\components\CustomVarDamp::dumpAndDie($xml->children()->children()); + $result = self::recursiveXMLToArray( $xml ); + } catch(Exception $ex) { + + throw $ex; + } + + return $result; + } + + /** + * Convert a XML string to a PHP array recursively. Do not + * call this function directly, Please use {@link Convert::xml2array()} + * + * @param SimpleXMLElement + * + * @return mixed + */ + protected static function recursiveXMLToArray($xml) { + if(is_object($xml) && get_class($xml) == 'SimpleXMLElement') { + $attributes = $xml->attributes(); + foreach($attributes as $k => $v) { + if($v) $a[$k] = (string) $v; + } + $x = $xml; + $xml = get_object_vars($xml); + } + + //\common\components\CustomVarDamp::dump($xml); + if(is_array($xml)) { + if(count($xml) == 0) return (string) $x; // for CDATA + foreach($xml as $key => $value) { + $r[$key] = self::recursiveXMLToArray($value); + } + if(isset($a)) $r['@'] = $a; // Attributes + return $r; + } + //\common\components\CustomVarDamp::dumpAndDie($xml); + return (string) $xml; + } +} \ No newline at end of file diff --git a/vendor/yiisoft/multiparser/YiiMultiparser.php b/vendor/yiisoft/multiparser/YiiMultiparser.php index 0308387..0abf73e 100644 --- a/vendor/yiisoft/multiparser/YiiMultiparser.php +++ b/vendor/yiisoft/multiparser/YiiMultiparser.php @@ -11,8 +11,26 @@ namespace yii\multiparser; use yii\base\Component; + + class YiiMultiparser extends Component{ +public $configuration; + + public function getConfiguration($extension, $conf_parameter){ + + if (!isset( $this->configuration[$extension] )){ + throw new \ErrorException( "Parser do not maintain file with extension {$extension}"); + } + if (!isset( $this->configuration[$extension][$conf_parameter] )){ + throw new \ErrorException( "Parser configurator do not have settings for {$conf_parameter} parameter"); + } + + return $this->configuration[$extension][$conf_parameter]; + + } + + public function parse( $filePath, $options = [] ){ $parser = new YiiParserHandler( $filePath, $options ); diff --git a/vendor/yiisoft/multiparser/YiiParserHandler.php b/vendor/yiisoft/multiparser/YiiParserHandler.php index fddd3d4..eb3cb4f 100644 --- a/vendor/yiisoft/multiparser/YiiParserHandler.php +++ b/vendor/yiisoft/multiparser/YiiParserHandler.php @@ -12,4 +12,72 @@ namespace yii\multiparser; class YiiParserHandler extends ParserHandler{ + /** + * @param $filePath + * @param array $options + * проверяет читабенльность переданного файла, а также наличие настроек парсера в конфигурационном файле для данного типа файла + */ + 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 = \Yii::$app->multiparser->getConfiguration($this->extension, $this->mode); + $this->configuration = array_merge($this->configuration, $options); + + } catch (\ErrorException $e) { + echo $e->getMessage(); + return []; + } + + } + + public function run() + { + + $result = []; + + // \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; + } + } \ No newline at end of file diff --git a/vendor/yiisoft/multiparser/config.php b/vendor/yiisoft/multiparser/config.php new file mode 100644 index 0000000..950efaa --- /dev/null +++ b/vendor/yiisoft/multiparser/config.php @@ -0,0 +1,20 @@ + + ['web' => + ['class' => 'yii\multiparser\CsvParser', + 'auto_detect_first_line' => true, + 'converter_conf' => [ + "float" => 'PRICE', + "integer" => 'QUANTITY', + "string" => 'DESCR' + ]], + 'basic_column' => [ + "ARTICLE" => 'Артикул', + "PRICE" => 'Цена', + "DESCR" => 'Наименование', + "QUANTITY" => 'Колво' + + ], + ]]; -- libgit2 0.21.4