@@ -95,9 +95,9 @@ |
||
| 95 | 95 | ->setType($this->type) |
| 96 | 96 | ->setSites($this->sites) |
| 97 | 97 | ->setActionSection($input->getOption('sections'))
|
| 98 | - ->setActionElement($input->getOption('elements'));;
|
|
| 98 | + ->setActionElement($input->getOption('elements')); ;
|
|
| 99 | 99 | |
| 100 | - foreach (glob(implode(DIRECTORY_SEPARATOR . '*', [$this->dir, $this->extension])) as $file) {
|
|
| 100 | + foreach (glob(implode(DIRECTORY_SEPARATOR.'*', [$this->dir, $this->extension])) as $file) {
|
|
| 101 | 101 | |
| 102 | 102 | try {
|
| 103 | 103 | $importer |
@@ -2,14 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Notamedia\ConsoleJedi\Iblock\Command; |
| 4 | 4 | |
| 5 | -use Notamedia\ConsoleJedi\Application\Command\BitrixCommand; |
|
| 6 | -use Notamedia\ConsoleJedi\Iblock\Exception\IblockException; |
|
| 7 | -use Notamedia\ConsoleJedi\Iblock\Importer; |
|
| 8 | -use Symfony\Component\Console\Input\InputArgument; |
|
| 9 | -use Symfony\Component\Console\Input\InputInterface; |
|
| 10 | -use Symfony\Component\Console\Input\InputOption; |
|
| 11 | -use Symfony\Component\Console\Output\OutputInterface; |
|
| 12 | -use Symfony\Component\Console\Helper\FormatterHelper; |
|
| 5 | +use Notamedia\ConsoleJedi\Application\Command\BitrixCommand; |
|
| 6 | +use Notamedia\ConsoleJedi\Iblock\Exception\IblockException; |
|
| 7 | +use Notamedia\ConsoleJedi\Iblock\Importer; |
|
| 8 | +use Symfony\Component\Console\Input\InputArgument; |
|
| 9 | +use Symfony\Component\Console\Input\InputInterface; |
|
| 10 | +use Symfony\Component\Console\Input\InputOption; |
|
| 11 | +use Symfony\Component\Console\Output\OutputInterface; |
|
| 12 | +use Symfony\Component\Console\Helper\FormatterHelper; |
|
| 13 | 13 | use Bitrix\Main\Loader; |
| 14 | 14 | |
| 15 | 15 | /** |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | |
| 97 | 97 | try {
|
| 98 | 98 | $xml_id = \CIBlockCMLExport::GetIBlockXML_ID($iblock['ID']); |
| 99 | - $path = implode(DIRECTORY_SEPARATOR, [$this->dir, $xml_id]) . $this->extension; |
|
| 99 | + $path = implode(DIRECTORY_SEPARATOR, [$this->dir, $xml_id]).$this->extension; |
|
| 100 | 100 | |
| 101 | 101 | $exporter |
| 102 | 102 | ->setPath($path) |
@@ -2,14 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Notamedia\ConsoleJedi\Iblock\Command; |
| 4 | 4 | |
| 5 | -use Notamedia\ConsoleJedi\Application\Command\BitrixCommand; |
|
| 6 | -use Notamedia\ConsoleJedi\Iblock\Exception\IblockException; |
|
| 7 | -use Notamedia\ConsoleJedi\Iblock\Exporter; |
|
| 8 | -use Symfony\Component\Console\Input\InputArgument; |
|
| 9 | -use Symfony\Component\Console\Input\InputInterface; |
|
| 10 | -use Symfony\Component\Console\Input\InputOption; |
|
| 11 | -use Symfony\Component\Console\Output\OutputInterface; |
|
| 12 | -use Symfony\Component\Console\Helper\FormatterHelper; |
|
| 5 | +use Notamedia\ConsoleJedi\Application\Command\BitrixCommand; |
|
| 6 | +use Notamedia\ConsoleJedi\Iblock\Exception\IblockException; |
|
| 7 | +use Notamedia\ConsoleJedi\Iblock\Exporter; |
|
| 8 | +use Symfony\Component\Console\Input\InputArgument; |
|
| 9 | +use Symfony\Component\Console\Input\InputInterface; |
|
| 10 | +use Symfony\Component\Console\Input\InputOption; |
|
| 11 | +use Symfony\Component\Console\Output\OutputInterface; |
|
| 12 | +use Symfony\Component\Console\Helper\FormatterHelper; |
|
| 13 | 13 | use Bitrix\Main\Loader; |
| 14 | 14 | |
| 15 | 15 | /** |
@@ -122,8 +122,9 @@ |
||
| 122 | 122 | {
|
| 123 | 123 | $handle = fopen($this->config['path'], "r"); |
| 124 | 124 | |
| 125 | - if (!$handle) |
|
| 126 | - throw new ImportException('Unable to open file, or file not exist');
|
|
| 125 | + if (!$handle) { |
|
| 126 | + throw new ImportException('Unable to open file, or file not exist'); |
|
| 127 | + } |
|
| 127 | 128 | |
| 128 | 129 | if (!$this->import->CheckIfFileIsCML($this->config['path'])) {
|
| 129 | 130 | throw new ImportException('File is not valid');
|
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | $this->session = [ |
| 118 | 118 | "section_map" => false, |
| 119 | 119 | "prices_map" => false, |
| 120 | - "work_dir" => pathinfo($this->config['path'], PATHINFO_DIRNAME) . DIRECTORY_SEPARATOR |
|
| 120 | + "work_dir" => pathinfo($this->config['path'], PATHINFO_DIRNAME).DIRECTORY_SEPARATOR |
|
| 121 | 121 | ]; |
| 122 | 122 | |
| 123 | 123 | $this->read(); |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | $this->session = [ |
| 105 | 105 | "property_map" => false, |
| 106 | 106 | "section_map" => false, |
| 107 | - "work_dir" => $pathinfo['dirname'] . DIRECTORY_SEPARATOR, |
|
| 108 | - "file_dir" => $pathinfo['filename'] . "_files" . DIRECTORY_SEPARATOR, |
|
| 107 | + "work_dir" => $pathinfo['dirname'].DIRECTORY_SEPARATOR, |
|
| 108 | + "file_dir" => $pathinfo['filename']."_files".DIRECTORY_SEPARATOR, |
|
| 109 | 109 | ]; |
| 110 | 110 | |
| 111 | 111 | $this->export(); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | protected function export() |
| 121 | 121 | {
|
| 122 | 122 | $filesystem = new Filesystem(); |
| 123 | - $handle = fopen($this->config['path'] . $this->prefix, "w"); |
|
| 123 | + $handle = fopen($this->config['path'].$this->prefix, "w"); |
|
| 124 | 124 | |
| 125 | 125 | $checkPermissions = true; |
| 126 | 126 | if (PHP_SAPI == 'cli') {
|
@@ -170,6 +170,6 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | fclose($handle); |
| 172 | 172 | $filesystem->remove($this->config['path']); |
| 173 | - $filesystem->rename($this->config['path'] . $this->prefix, $this->config['path'], true); |
|
| 173 | + $filesystem->rename($this->config['path'].$this->prefix, $this->config['path'], true); |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | \ No newline at end of file |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | if (!$dir) { |
| 71 | 71 | $dir = $app->getRoot(); |
| 72 | 72 | } elseif (!$filesystem->isAbsolutePath($dir)) { |
| 73 | - $dir = $app->getRoot() . DIRECTORY_SEPARATOR . $dir; |
|
| 73 | + $dir = $app->getRoot().DIRECTORY_SEPARATOR.$dir; |
|
| 74 | 74 | } |
| 75 | 75 | $dir = rtrim($dir, DIRECTORY_SEPARATOR); |
| 76 | 76 | |