.travis.yml

@@ -1,21 +1,28 @@
 language: php
+sudo: false
+
 php:
-    - "5.4"
-    - "5.5"
-    - "5.6"
+    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
 
-# Allow to use container infrastructure
-sudo: false
+matrix:
+    allow_failures:
+        - php: 7.0
 
 cache:
     directories:
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
 
-before_script:
-    - phpenv config-add travis.php.ini
+before_install:
+    - echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    - phpenv config-rm xdebug.ini
     - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+
+install:
     - composer self-update --no-interaction
-    - composer update --no-interaction --no-scripts
+    - composer update --no-interaction --no-scripts --prefer-dist
 
 script:
     - ./bin/phpspec run

ArrayConverter/Flat/Product/ValueConverter/TextConverter.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Pim\Bundle\ExcelConnectorBundle\ArrayConverter\Flat\Product\ValueConverter;
+
+use Pim\Component\Connector\ArrayConverter\Flat\Product\FieldSplitter;
+use Pim\Component\Connector\ArrayConverter\Flat\Product\ValueConverter\AbstractValueConverter;
+
+/**
+ * Converts text value into structured one.
+ *
+ * @author    Yohan Blain <yohan.blain@akeneo.com>
+ * @copyright 2016 Akeneo SAS (http://www.akeneo.com)
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+class TextConverter extends AbstractValueConverter
+{
+    /**
+     * @param FieldSplitter $fieldSplitter
+     * @param array         $supportedFieldType
+     */
+    public function __construct(FieldSplitter $fieldSplitter, array $supportedFieldType)
+    {
+        parent::__construct($fieldSplitter);
+
+        $this->supportedFieldType = $supportedFieldType;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convert(array $attributeFieldInfo, $value)
+    {
+        if ('' !== $value) {
+            $data = (string) $value;
+        } else {
+            $data = null;
+        }
+
+        return [$attributeFieldInfo['attribute']->getCode() => [[
+            'locale' => $attributeFieldInfo['locale_code'],
+            'scope'  => $attributeFieldInfo['scope_code'],
+            'data'   => $data,
+        ]]];
+    }
+}

CHANGELOG-1.2.md

@@ -0,0 +1,11 @@
+# CHANGELOG 1.2
+
+## 1.2.0 (2014-05-14)
+- Added support for Akeneo Spreadsheet parser
+
+## 1.1.0 (2014-04-16)
+- Added Office XML 2003 export
+- Compatibility with version 1.1 of Akeneo PIM
+
+## 1.1.0 (2014-03-07)
+ - Initial release.

CHANGELOG-1.3.md

@@ -0,0 +1,13 @@
+# CHANGELOG 1.3
+
+## 1.3.2 (2014-09-25)
+ - Added compatibility with PIM CE 1.2.6
+
+## 1.3.1 (2014-09-22)
+ - Fixed write count for homogeneous CSV writer
+
+## 1.3.0 (2014-09-11)
+ - Added SpreadsheetReader, for compatibility with all formats supported by Akeneo Spreadsheet parser
+ - Compatibility with version 1.2 of Akeneo PIM CE
+ - Removed content type constraint on readers
+ - pim_excel_connector.reader.xls_init service was renamed pim_excel_connector.reader.xls

CHANGELOG-1.4.md

@@ -0,0 +1,16 @@
+# CHANGELOG 1.4
+
+## 1.4.1 (2015-10-13)
+### Bug fix
+ - EX-17: Allow init import and product import having numeric identifier
+
+### BC break
+ - Inject `pim_catalog.repository.attribute` inside `pim_excel_connector.reader.spreadsheet` with `setAttributeRepository` method
+
+## 1.4.0 (2015-03-17)
+ - Made compatible with PIM CE 1.3.x
+ - Updated the init file from fixtures:
+    - Removed default_value and usable_as_grid_column from attributes and family tab
+    - Corrected the codes for wysywig_enabled and available_locales in the attributes and family tab
+    - Removed the is_default column from the options tab
+    - Removed garbage characters

CHANGELOG-1.5.md

@@ -0,0 +1,28 @@
+# CHANGELOG 1.5
+
+## 1.5.4
+
+### Improvement
+- EX-24: allow import numeric values for text and textarea attributes
+
+
+## 1.5.2
+
+### Bug fix
+ - EX-22: Fix associations in product import
+
+### Improvement
+ - The product XLSX import don't rely anymore to the deprecated import services
+
+
+## 1.5.1 (2015-10-13)
+
+### Bug fix
+ - EX-17: Allow init import and product import having numeric identifier
+
+### BC break
+ - Inject `pim_catalog.repository.attribute` inside `pim_excel_connector.reader.spreadsheet` with `setAttributeRepository` method
+
+
+## 1.5.0 (2015-10-07)
+ - Migrate bundle to AkeneoLabs

CHANGELOG-1.6.md

@@ -0,0 +1,16 @@
+# CHANGELOG 1.6
+
+## 1.6.2
+### Improvement
+- EX-24: allow import numeric values for text and textarea attributes
+
+## 1.6.1
+### Bug fix
+ - EX-22: Fix associations in product import
+
+### Improvement
+ - The product XLSX import don't rely anymore to the deprecated import services
+
+## 1.6.0
+### Features
+ - Compatibility with Akeneo PIM 1.5

DependencyInjection/PimExcelConnectorExtension.php

@@ -31,5 +31,6 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('excel.yml');
         $loader->load('processors.yml');
         $loader->load('serializer.yml');
+        $loader->load('array_converters.yml');
     }
 }

Excel/Builder/AbstractExcelBuilder.php

@@ -2,6 +2,8 @@
 
 namespace Pim\Bundle\ExcelConnectorBundle\Excel\Builder;
 
+use PHPExcel;
+use PHPExcel_Worksheet;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -22,7 +24,7 @@ abstract class AbstractExcelBuilder implements ExcelBuilderInterface
     /** @var array */
     protected $options;
 
-    /** @var \PHPExcel */
+    /** @var PHPExcel */
     protected $xls;
 
     /** @var boolean */
@@ -36,7 +38,7 @@ public function __construct(array $options = array())
         $resolver = new OptionsResolver();
         $this->setDefaultOptions($resolver);
         $this->options = $resolver->resolve($options);
-        $this->xls = new \PHPExcel();
+        $this->xls = new PHPExcel();
     }
 
     /**
@@ -90,10 +92,10 @@ protected function getWorksheet(array $data)
     /**
      * Creates a worksheet with the given name
      *
-     * @param type  $name
-     * @param array $data
+     * @param string $name
+     * @param array  $data
      *
-     * @return \PHPExcelWorksheet
+     * @return PHPExcel_Worksheet
      */
     protected function createWorksheet($name, array $data)
     {
@@ -118,10 +120,10 @@ protected function cleanup()
     /**
      * Writes labels for the submitted data
      *
-     * @param \PHPExcel_Worksheet $worksheet
+     * @param PHPExcel_Worksheet $worksheet
      * @param array               $data
      */
-    protected function writeLabels(\PHPExcel_Worksheet $worksheet, array $data)
+    protected function writeLabels(PHPExcel_Worksheet $worksheet, array $data)
     {
         $worksheetName = $worksheet->getTitle();
         $missing = array_diff(array_keys($data), $this->labels[$worksheetName]);
@@ -136,10 +138,10 @@ protected function writeLabels(\PHPExcel_Worksheet $worksheet, array $data)
     /**
      * Writes a row of values
      *
-     * @param \PHPExcel_Worksheet $worksheet
+     * @param PHPExcel_Worksheet $worksheet
      * @param array               $data      An array of values with column indexes as keys
      */
-    protected function writeValues(\PHPExcel_Worksheet $worksheet, array $data)
+    protected function writeValues(PHPExcel_Worksheet $worksheet, array $data)
     {
         $worksheetName = $worksheet->getTitle();
         $row = $this->rowIndexes[$worksheetName];

Excel/Builder/ProductFamilyExcelBuilder.php

@@ -2,6 +2,8 @@
 
 namespace Pim\Bundle\ExcelConnectorBundle\Excel\Builder;
 
+use PHPExcel_Shared_String;
+
 /**
  * Excel builder for products, with one tab per family
  *
@@ -16,6 +18,10 @@ class ProductFamilyExcelBuilder extends AbstractExcelBuilder
      */
     protected function getWorksheetName(array $data)
     {
-        return $data['family'];
+        $worksheetName = $data['family'];
+        if (PHPExcel_Shared_String::CountCharacters($worksheetName) > 31) {
+            $worksheetName = PHPExcel_Shared_String::Substring($worksheetName, 0, 31);
+        }
+        return $worksheetName;
     }
 }

README.md

@@ -5,6 +5,8 @@
 
 ![alt text](./Resources/doc/pictures/akeneo_excel.png "")
 
+**DEPRECATED**: this bundle is not compatible with the latest Akeneo PIM. Starting from 1.6 PIM version, you should use [ExcelInitBundle](https://github.com/akeneo/ExcelInitBundle) instead.
+
 This bundle adds support of Excel XSLX files as a source for initializing catalog structure and import/export of products for [Akeneo PIM](https://github.com/akeneo/pim-community-standard).
 
 ## Requirements
@@ -23,7 +25,7 @@ This bundle adds support of Excel XSLX files as a source for initializing catalo
 From your application root:
 
 ```bash
-    $ php composer.phar require --prefer-dist akeneo-labs/excel-connector-bundle:1.6.*
+    php composer.phar require --prefer-dist akeneo-labs/excel-connector-bundle:1.6.*
 ```
 
 Enable the bundle in the `app/AppKernel.php` file in the `registerBundles()` method:
@@ -36,12 +38,11 @@ Enable the bundle in the `app/AppKernel.php` file in the `registerBundles()` met
     ]
 ```
 
-Then clean the cache and reinstall the assets:
+Now let's clean your cache and dump your assets:
 
 ```bash
     php app/console cache:clear --env=prod
-
-    php app/console pim:install:assets --env=prod
+    php app/console pim:installer:assets --env=prod
 ```
 
 ## Documentation
@@ -51,7 +52,7 @@ Then clean the cache and reinstall the assets:
 See [Resources/doc/Getting started](./Resources/doc/Getting-started.rst) for more details on how to set your catalog structure
 using the [init.xslx](./Resources/fixtures/minimal/init.xlsx) file.
 
-See [Resources/doc folder](./Resources/doc/Home.rst) for more details on how to set your catalog structur
+See [Resources/doc folder](./Resources/doc/Home.rst) for more details on how to set your catalog structure
 
 ### Supported file
 

Reader/AbstractIteratorReader.php

@@ -66,12 +66,24 @@ public function read()
 
     /**
      * Resets the state of the reader
+     *
+     * @deprecated will be remove in 1.7. Use initialize method instead.
      */
     public function reset()
     {
         $this->iterator = null;
     }
 
+    /**
+     * Initializes the iterator allowing to use the same service in two successive steps
+     *
+     * {@inheritdoc}
+     */
+    public function initialize()
+    {
+        $this->iterator = null;
+    }
+
     /**
      * Converts an entity numerical identifier ('sku' for products,
      * 'code' for other entities) into string to allow import.