Added Bridge for Visithor Bundle

* Added initial visithor configuration file * Added visithor test to travis with green result * Added default carrier ranges to cover basic scenario * Fixed routes to make visithor pass * Moved phpunit.xml.dist to the root * Fixed workflow product test
elcodi · May 7, 2015 · c101c6c · c101c6c
1 parent 945db4e
commit c101c6c
Show file tree

Hide file tree

Showing 19 changed files with 514 additions and 112 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,8 @@ services:
 
 script:
     - bin/behat -fprogress --tags="~javascript"
-    - bin/phpunit -c app
+    - bin/phpunit
+    - php app/console visithor:go --format=pretty --env=test
 
 notifications:
     email: false

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -169,6 +169,9 @@ public function registerBundles()
             $bundles[] = new Elcodi\Bundle\FixturesBoosterBundle\ElcodiFixturesBoosterBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
+
+            $bundles[] = new Visithor\Bundle\VisithorBundle();
+            $bundles[] = new Elcodi\Common\VisithorBridgeBundle\VisithorBridgeBundle();
         }
 
         return $bundles;

diff --git a/composer.json b/composer.json
@@ -122,7 +122,8 @@
         "phpunit/phpunit": "4.5.0",
 
         "mmoreram/php-formatter": "1.0.4",
-        "fabpot/php-cs-fixer": "1.4.2"
+        "fabpot/php-cs-fixer": "1.4.2",
+        "visithor/visithor-bundle": "~0.1, >=0.1.7"
     },
     "scripts": {
         "post-install-cmd": [

diff --git a/features/store/category.feature b/features/store/category.feature
@@ -8,7 +8,6 @@ Feature: Store category
     Given I am on "category/women-shirts/1"
     Then I should see more than 0 products
 
-  @haha
   Scenario: Category redirection
     Given I am on "category/women-shirts-false/1"
     Then I should be on "category/women-shirts/1"
diff --git a/features/workflow/product.feature b/features/workflow/product.feature
@@ -18,7 +18,7 @@ Feature: Product engine
     And I check "elcodi_admin_product_form_type_product_enabled"
     And I press "submit-save"
     And I am on "/admin/product/19/variant/new"
-    And I wait "1" seconds
+    And I wait "3" seconds
     And I select "1" from "select-Size"
     And I select "4" from "select-Color"
     And I fill in the following:

diff --git a/app/phpunit.xml.dist → phpunit.xml.dist b/app/phpunit.xml.dist → phpunit.xml.dist
@@ -11,20 +11,20 @@
     processIsolation            = "false"
     stopOnFailure               = "false"
     syntaxCheck                 = "false"
-    bootstrap                   = "bootstrap.php.cache" >
+    bootstrap                   = "app/bootstrap.php.cache" >
 
     <testsuites>
         <testsuite name="Bamboo Test Suite">
-            <directory>../src/Elcodi/*/*Bundle/Tests</directory>
+            <directory>src/Elcodi/*/*Bundle/Tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>../src</directory>
+            <directory>src</directory>
             <exclude>
-                <directory>../src/Elcodi/*/*Bundle/Resources</directory>
-                <directory>../src/Elcodi/*/*Bundle/Tests</directory>
+                <directory>src/Elcodi/*/*Bundle/Resources</directory>
+                <directory>src/Elcodi/*/*Bundle/Tests</directory>
             </exclude>
         </whitelist>
     </filter>

diff --git a/src/Elcodi/Admin/CurrencyBundle/DataFixtures/Currency/CurrencyEuroData.php b/src/Elcodi/Admin/CurrencyBundle/DataFixtures/Currency/CurrencyEuroData.php
@@ -21,7 +21,6 @@
 
 use Elcodi\Bundle\CoreBundle\DataFixtures\ORM\Abstracts\AbstractFixture;
 use Elcodi\Component\Core\Services\ObjectDirector;
-use Elcodi\Component\Currency\Factory\CurrencyFactory;
 
 /**
  * Class CurrencyEuroData

diff --git a/src/Elcodi/Admin/ProductBundle/Controller/ManufacturerController.php b/src/Elcodi/Admin/ProductBundle/Controller/ManufacturerController.php
@@ -17,7 +17,6 @@
 
 namespace Elcodi\Admin\ProductBundle\Controller;
 
-use Elcodi\Component\Media\Entity\Interfaces\ImageInterface;
 use Mmoreram\ControllerExtraBundle\Annotation\Entity as EntityAnnotation;
 use Mmoreram\ControllerExtraBundle\Annotation\Form as FormAnnotation;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -29,6 +28,7 @@
 
 use Elcodi\Admin\CoreBundle\Controller\Abstracts\AbstractAdminController;
 use Elcodi\Component\Core\Entity\Interfaces\EnabledInterface;
+use Elcodi\Component\Media\Entity\Interfaces\ImageInterface;
 use Elcodi\Component\Product\Entity\Interfaces\ManufacturerInterface;
 
 /**

diff --git a/src/Elcodi/Admin/ProductBundle/Controller/ProductController.php b/src/Elcodi/Admin/ProductBundle/Controller/ProductController.php
@@ -17,7 +17,6 @@
 
 namespace Elcodi\Admin\ProductBundle\Controller;
 
-use Elcodi\Component\Media\Entity\Interfaces\ImageInterface;
 use Mmoreram\ControllerExtraBundle\Annotation\Entity as EntityAnnotation;
 use Mmoreram\ControllerExtraBundle\Annotation\Form as FormAnnotation;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -29,6 +28,7 @@
 
 use Elcodi\Admin\CoreBundle\Controller\Abstracts\AbstractAdminController;
 use Elcodi\Component\Core\Entity\Interfaces\EnabledInterface;
+use Elcodi\Component\Media\Entity\Interfaces\ImageInterface;
 use Elcodi\Component\Product\Entity\Interfaces\ProductInterface;
 
 /**

diff --git a/src/Elcodi/Admin/ProductBundle/Controller/VariantController.php b/src/Elcodi/Admin/ProductBundle/Controller/VariantController.php
@@ -17,7 +17,6 @@
 
 namespace Elcodi\Admin\ProductBundle\Controller;
 
-use Elcodi\Component\Media\Entity\Interfaces\ImageInterface;
 use Mmoreram\ControllerExtraBundle\Annotation\Entity as EntityAnnotation;
 use Mmoreram\ControllerExtraBundle\Annotation\Form as FormAnnotation;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -31,6 +30,7 @@
 use Elcodi\Component\Attribute\Entity\Interfaces\AttributeInterface;
 use Elcodi\Component\Attribute\Entity\Interfaces\ValueInterface;
 use Elcodi\Component\Core\Entity\Interfaces\EnabledInterface;
+use Elcodi\Component\Media\Entity\Interfaces\ImageInterface;
 use Elcodi\Component\Product\Entity\Interfaces\ProductInterface;
 use Elcodi\Component\Product\Entity\Interfaces\VariantInterface;
 

diff --git a/src/Elcodi/Admin/UserBundle/Controller/Stats/CustomerStatsController.php b/src/Elcodi/Admin/UserBundle/Controller/Stats/CustomerStatsController.php
diff --git a/src/Elcodi/Admin/UserBundle/Resources/views/Customer/edit.html.twig b/src/Elcodi/Admin/UserBundle/Resources/views/Customer/edit.html.twig
@@ -31,10 +31,12 @@
 
 {% block header_actions %}
 
-    <a href="{{ url('admin_customer_order_list', { customerId: customer.id }) }}" type="button" class="button-primary">
-        <i class="icon-shopping-cart"></i>
-        <span>{{ 'admin.order.from_user'|trans({ '%name%': customer.firstname }) }}</span>
-    </a>
+    {% if customer.id %}
+        <a href="{{ url('admin_customer_order_list', { customerId: customer.id }) }}" type="button" class="button-primary">
+            <i class="icon-shopping-cart"></i>
+            <span>{{ 'admin.order.from_user'|trans({ '%name%': customer.firstname }) }}</span>
+        </a>
+    {% endif %}
 
 {% endblock header_actions %}
 

diff --git a/src/Elcodi/Common/VisithorBridgeBundle/DependencyInjection/VisithorBridgeExtension.php b/src/Elcodi/Common/VisithorBridgeBundle/DependencyInjection/VisithorBridgeExtension.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Elcodi package.
+ *
+ * Copyright (c) 2014-2015 Elcodi.com
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <yuhu@mmoreram.com>
+ * @author Aldo Chiecchia <zimage@tiscali.it>
+ * @author Elcodi Team <tech@elcodi.com>
+ */
+
+namespace Elcodi\Common\VisithorBridgeBundle\DependencyInjection;
+
+use Elcodi\Bundle\CoreBundle\DependencyInjection\Abstracts\AbstractExtension;
+
+/**
+ * Class VisithorBridgeExtension
+ */
+class VisithorBridgeExtension extends AbstractExtension
+{
+    /**
+     * @var string
+     *
+     * Extension name
+     */
+    const EXTENSION_NAME = 'visithor_bridge';
+
+    /**
+     * Get the Config file location
+     *
+     * @return string Config file location
+     */
+    public function getConfigFilesLocation()
+    {
+        return __DIR__ . '/../Resources/config';
+    }
+
+    /**
+     * Config files to load
+     *
+     * Each array position can be a simple file name if must be loaded always,
+     * or an array, with the filename in the first position, and a boolean in
+     * the second one.
+     *
+     * As a parameter, this method receives all loaded configuration, to allow
+     * setting this boolean value from a configuration value.
+     *
+     * return array(
+     *      'file1.yml',
+     *      'file2.yml',
+     *      ['file3.yml', $config['my_boolean'],
+     *      ...
+     * );
+     *
+     * @param array $config Config definitions
+     *
+     * @return array Config files
+     */
+    protected function getConfigFiles(array $config)
+    {
+        return [
+            'visithor',
+        ];
+    }
+
+    /**
+     * Returns the extension alias, same value as extension name
+     *
+     * @return string The alias
+     */
+    public function getAlias()
+    {
+        return self::EXTENSION_NAME;
+    }
+}