leaphly · liuggio · Nov 21, 2013 · Nov 23, 2013 · Nov 23, 2013 · Nov 23, 2013
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -35,7 +35,7 @@ public function registerBundles()
         // if is mongo or orm load modules
         if (in_array($this->getEnvironment(), array('dev', 'test', 'prod'))) {
             $bundles[] = new Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle();
-        } else if (in_array($this->getEnvironment(), array('orm_dev', 'orm_test', 'orm_prod'))) {
+        } elseif (in_array($this->getEnvironment(), array('orm_dev', 'orm_test', 'orm_prod'))) {
             $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
             $bundles[] = new Doctrine\Bundle\DoctrineBundle\DoctrineBundle();
         }

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -7,7 +7,7 @@
         <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
     </head>
     <body>
-        {% block body %}{% endblock %}
+        {% block body %}leaphly{% endblock %}
         {% block javascripts %}{% endblock %}
     </body>
 </html>
diff --git a/app/config/config_base_test.yml b/app/config/config_base_test.yml
@@ -14,4 +14,4 @@ swiftmailer:
 
 # stub for http client.
 parameters:
-    acme.demo.http_client.class: Acme\SimplePurchaseProcessBundle\Tests\Mock\MockedHttpClient
+    acme.demo.http_client.class: Acme\SimplePurchaseProcessBundle\Tests\Mock\MockedHttpClient
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -1,3 +1,3 @@
 imports:
     - { resource: leaphly/dbdriver.mongodb.yml }
-    - { resource: config_base_dev.yml }
+    - { resource: config_base_dev.yml }
diff --git a/app/config/leaphly/dbdriver.mongodb.yml b/app/config/leaphly/dbdriver.mongodb.yml
@@ -16,4 +16,4 @@ leaphly_cart:
         full:
             form: acme_cart.cart.form.type
         limited:
-            form: acme_cart.cart.limited.form.type
+            form: acme_cart.cart.limited.form.type
diff --git a/app/config/leaphly/rest.yml b/app/config/leaphly/rest.yml
@@ -51,4 +51,4 @@ fos_js_routing:
         - api_1_put_cart
         - api_1_post_cart_item
         - api_1_delete_cart_item
-        - api_1_delete_cart_items
+        - api_1_delete_cart_items
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -3,8 +3,8 @@ parameters:
     database_host:     127.0.0.1
     database_port:     ~
     database_name:     symfony
-    database_user:     root
     database_user:     travis
+    database_password: ~
 
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
@@ -14,5 +14,5 @@ parameters:
     locale:            en
     secret:            ThisTokenIsNotSoSecretChangeIt
 
-    leaphly_api_host: http://localhost
-    leaphly_api_port: 8000
+    leaphly_api_host: http://cart.local
+    leaphly_api_port: 80
diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -6,6 +6,13 @@ simple_purchase_process:
     resource: "@SimplePurchaseProcessBundle/Resources/config/routing.xml"
     prefix:   /purchase-process
 
+leaphly_content_install_sandbox:
+    path: /install-the-sandbox
+    defaults:
+        _controller: FrameworkBundle:Redirect:urlRedirect
+        path: http://doc.leaphly.org/book/installation.html
+        permanent: true
+#
 leaphly_cart:
     type: rest
     resource: "@AcmeCartBundle/Resources/config/rest.xml"
@@ -31,4 +38,4 @@ logout:
 # used to create the route via template handler
 documentation:
     path:     /
-    host:     doc.leaphly.org
+    host:     doc.leaphly.org
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
@@ -17,6 +17,8 @@
         <testsuite name="Project Test Suite">
             <directory>../src/*/*Bundle/Tests</directory>
             <directory>../src/*/Bundle/*Bundle/Tests</directory>
+            <directory>../vendor/leaphly/*/*Bundle/Tests</directory>
+            <directory>../vendor/leaphly/*/Bundle/*Bundle/Tests</directory>
         </testsuite>
     </testsuites>
 

diff --git a/src/Acme/CartBundle/DependencyInjection/AcmeCartExtension.php b/src/Acme/CartBundle/DependencyInjection/AcmeCartExtension.php
@@ -28,7 +28,6 @@ public function load(array $configs, ContainerBuilder $container)
         $this->loadDbDriver($config, $container, $loader);
     }
 
-
     private function loadDbDriver($config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load(sprintf('%s.xml', $config['db_driver']));

diff --git a/src/Acme/CartBundle/Document/Cart.php b/src/Acme/CartBundle/Document/Cart.php
@@ -5,12 +5,6 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Leaphly\Cart\Model\Cart as BaseCart;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoDB;
-use JMS\Serializer\Annotation\ExclusionPolicy;
-use JMS\Serializer\Annotation\Groups;
-use JMS\Serializer\Annotation\Accessor;
-use JMS\Serializer\Annotation\Expose;
-use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 /**
  * @MongoDB\Document
@@ -53,4 +47,4 @@ public function getCustomer()
     {
         return $this->customer;
     }
-}
+}
diff --git a/src/Acme/CartBundle/Document/Product.php b/src/Acme/CartBundle/Document/Product.php
@@ -2,7 +2,6 @@
 
 namespace Acme\CartBundle\Document;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoDB;
 
 /**
@@ -80,4 +79,4 @@ public function __toString()
     {
         return $this->getName();
     }
-}
+}
diff --git a/src/Acme/CartBundle/Entity/Cart.php b/src/Acme/CartBundle/Entity/Cart.php
@@ -51,4 +51,4 @@ public function getCustomer()
     {
         return $this->customer;
     }
-}
+}
diff --git a/src/Acme/CartBundle/Entity/Product.php b/src/Acme/CartBundle/Entity/Product.php
@@ -81,5 +81,4 @@ public function getPrice()
         return $this->price;
     }
 
-
-}
+}
diff --git a/src/Acme/CartBundle/Form/Type/CartFormType.php b/src/Acme/CartBundle/Form/Type/CartFormType.php
@@ -14,7 +14,7 @@ class CartFormType extends BaseCartFormType
 {
     /**
      * @param FormBuilderInterface $builder
-     * @param array $options
+     * @param array                $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

diff --git a/src/Acme/CartBundle/Form/Type/LimitedCartFormType.php b/src/Acme/CartBundle/Form/Type/LimitedCartFormType.php
@@ -13,7 +13,7 @@ class LimitedCartFormType extends BaseCartFormType
 {
     /**
      * @param FormBuilderInterface $builder
-     * @param array $options
+     * @param array                $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

diff --git a/src/Acme/CartBundle/Resources/config/mongodb.xml b/src/Acme/CartBundle/Resources/config/mongodb.xml
@@ -19,4 +19,4 @@
             <argument>%acme_cart.product.class%</argument>
         </service>
     </services>
-</container>
+</container>
diff --git a/src/Acme/CartBundle/Resources/config/orm.xml b/src/Acme/CartBundle/Resources/config/orm.xml
@@ -20,4 +20,4 @@
             <argument>%acme_cart.product.class%</argument>
         </service>
     </services>
-</container>
+</container>
diff --git a/src/Acme/CartBundle/Resources/config/rest.xml b/src/Acme/CartBundle/Resources/config/rest.xml
@@ -9,4 +9,4 @@
     <import id="carts_full" type="rest" resource="leaphly_cart.cart.full.controller" name-prefix="api_1_full_" prefix="/full" />
     <import id="cartItems_full" type="rest" resource="leaphly_cart.cart_item.full.controller" name-prefix="api_1_full_" parent="carts_full" prefix="/full" />
     <import id="cartTransitions" type="rest" resource="Leaphly\CartBundle\Controller\CartTransitionsController" name-prefix="api_1_" parent="carts" />
-</routes>
+</routes>
diff --git a/src/Acme/CartBundle/Tests/DependencyInjection/CartBundleExtensionTest.php b/src/Acme/CartBundle/Tests/DependencyInjection/CartBundleExtensionTest.php
@@ -4,8 +4,6 @@
 
 use Acme\CartBundle\DependencyInjection\AcmeCartExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Leaphly\CartBundle\DependencyInjection\LeaphlyCartExtension;
-use Symfony\Component\Yaml\Parser;
 
 /**
  *

diff --git a/src/Acme/CartBundle/Tests/Fixture/Document/LoadCartData.php b/src/Acme/CartBundle/Tests/Fixture/Document/LoadCartData.php
@@ -35,4 +35,4 @@ public function load(ObjectManager $manager)
 
         FixtureCollector::addCart(FixtureCollector::MONGODB, $cart);
     }
-}
+}
diff --git a/src/Acme/CartBundle/Tests/Fixture/Document/LoadProductData.php b/src/Acme/CartBundle/Tests/Fixture/Document/LoadProductData.php
@@ -24,4 +24,4 @@ public function load(ObjectManager $manager)
         FixtureCollector::addProduct(FixtureCollector::MONGODB, $tshirt->getId());
         FixtureCollector::addProduct(FixtureCollector::MONGODB, $ticket->getId());
     }
-}
+}
diff --git a/src/Acme/CartBundle/Tests/Fixture/Entity/LoadProductData.php b/src/Acme/CartBundle/Tests/Fixture/Entity/LoadProductData.php
@@ -25,4 +25,4 @@ public function load(ObjectManager $manager)
         FixtureCollector::addProduct(FixtureCollector::ORM, $tshirt->getId());
         FixtureCollector::addProduct(FixtureCollector::ORM, $ticket->getId());
     }
-}
+}
diff --git a/src/Acme/CartBundle/Tests/Fixture/FixtureCollector.php b/src/Acme/CartBundle/Tests/Fixture/FixtureCollector.php
@@ -5,8 +5,8 @@
 /**
  * Class FixtureCollector, just a fixture container, useful when you need the Id of the entity inserted.
  */
-final class FixtureCollector {
-
+final class FixtureCollector
+{
     const MONGODB = 'doctrine_mongodb';
     const ORM = 'doctrine';
 
@@ -35,6 +35,7 @@ public static function getCarts($doctrine)
     public static function getProducts($doctrine)
     {
         $products = isset(self::$products[$doctrine])? self::$products[$doctrine] : array();
+
         return $products;
     }
-}
+}
diff --git a/src/Acme/CartBundle/Tests/Listener/PriceCalculatorListenerTest.php b/src/Acme/CartBundle/Tests/Listener/PriceCalculatorListenerTest.php
@@ -49,4 +49,4 @@ public function testListenerShouldAutomaticallySetTheCartPriceViaRest($env, $fix
         $this->assertGreaterThan(0, $cart->getPrice());
         $this->assertGreaterThan(0, $cart->getFinalPrice());
     }
-}
+}
diff --git a/src/Acme/CartBundle/Tests/WebTestCase.php b/src/Acme/CartBundle/Tests/WebTestCase.php
@@ -82,4 +82,4 @@ public function multiEnvProvider()
         );
     }
 
-}
+}
diff --git a/src/Acme/Product/ConferenceBundle/DataFixtures/MongoDB/LoadTicketData.php b/src/Acme/Product/ConferenceBundle/DataFixtures/MongoDB/LoadTicketData.php
@@ -24,4 +24,4 @@ public function load(ObjectManager $manager)
 
         $manager->flush();
     }
-}
+}
diff --git a/src/Acme/Product/ConferenceBundle/DataFixtures/ORM/LoadTicketData.php b/src/Acme/Product/ConferenceBundle/DataFixtures/ORM/LoadTicketData.php
@@ -13,4 +13,4 @@ public function load(ObjectManager $manager)
     {
 
     }
-}
+}
diff --git a/src/Acme/Product/ConferenceBundle/DependencyInjection/AcmeConferenceExtension.php b/src/Acme/Product/ConferenceBundle/DependencyInjection/AcmeConferenceExtension.php
@@ -27,7 +27,6 @@ public function load(array $configs, ContainerBuilder $container)
         $this->loadDbDriver($config, $container, $loader);
     }
 
-
     private function loadDbDriver($config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load(sprintf('%s.xml', $config['db_driver']));

diff --git a/src/Acme/Product/ConferenceBundle/Document/TicketItem.php b/src/Acme/Product/ConferenceBundle/Document/TicketItem.php
@@ -29,21 +29,18 @@ class TicketItem extends BaseItem
      */
     protected $when;
 
-
     /**
      * @var
      * @MongoDB\Field(type="string")
      */
     protected $position;
 
-
     /**
      * @var
      * @MongoDB\Field(type="int")
      */
     protected $adults;
 
-
     /**
      * @var
      * @MongoDB\Field(type="int")
@@ -72,7 +69,6 @@ public function getProduct()
         return $this->product;
     }
 
-
     /**
      * @param mixed $adults
      */
@@ -137,7 +133,6 @@ public function getWhen()
         return $this->when;
     }
 
-
     /**
      * @param string $conferenceName
      */
@@ -153,4 +148,4 @@ public function getConferenceName()
     {
         return $this->conferenceName;
     }
-}
+}
diff --git a/src/Acme/Product/ConferenceBundle/Document/TicketProduct.php b/src/Acme/Product/ConferenceBundle/Document/TicketProduct.php
@@ -25,4 +25,4 @@ public function getType()
     {
         return 'ticket';
     }
-}
+}
diff --git a/src/Acme/Product/ConferenceBundle/Entity/TicketItem.php b/src/Acme/Product/ConferenceBundle/Entity/TicketItem.php
@@ -17,28 +17,24 @@ class TicketItem extends BaseItem
      */
     protected $conferenceName;
 
-
     /**
      * @var \Datetime $when
      * @ORM\Column(type="datetime", nullable=true, name="when_date")
      */
     protected $when;
 
-
     /**
      * @var string $position
      * @ORM\Column(type="string", nullable=true)
      */
     protected $position;
 
-
     /**
      * @var integer $adults
      * @ORM\Column(type="integer", nullable=true)
      */
     protected $adults;
 
-
     /**
      * @var integer $children
      * @ORM\Column(type="integer", nullable=true)
@@ -148,5 +144,4 @@ public function getWhen()
         return $this->when;
     }
 
-
 }
diff --git a/src/Acme/Product/ConferenceBundle/Entity/TicketProduct.php b/src/Acme/Product/ConferenceBundle/Entity/TicketProduct.php
@@ -21,4 +21,4 @@ public function getType()
     {
         return 'ticket';
     }
-}
+}
diff --git a/src/Acme/Product/ConferenceBundle/Form/TicketItemFullAccessType.php b/src/Acme/Product/ConferenceBundle/Form/TicketItemFullAccessType.php
@@ -4,13 +4,12 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class TicketItemFullAccessType extends AbstractType
 {
      /**
      * @param FormBuilderInterface $builder
-     * @param array $options
+     * @param array                $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

diff --git a/src/Acme/Product/ConferenceBundle/Form/TicketItemType.php b/src/Acme/Product/ConferenceBundle/Form/TicketItemType.php
@@ -18,7 +18,7 @@ public function __construct($product_id = null)
 
     /**
      * @param FormBuilderInterface $builder
-     * @param array $options
+     * @param array                $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-Original file line number
+Diff line change
@@ Expand Up @@
             $this->loadDbDriver($config, $container, $loader);
         }
         private function loadDbDriver($config, ContainerBuilder $container, XmlFileLoader $loader)
         {
             $loader->load(sprintf('%s.xml', $config['db_driver']));
@@ Expand Down @@