Merge with release branch

CHANGELOG.md

@@ -1,3 +1,18 @@
+CHANGELOG for 1.0.0-alpha5
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha5 versions.
+
+* 1.0.0-alpha5 (2013-08-29)
+ * Custom entity creation
+ * Cron Job
+ * Record ownership
+ * Grid Improvements
+ * Filter Improvements
+ * Email Template Improvements
+ * Implemented extractor for messages in PHP code
+ * Removed dependency on SonataAdminBundle
+ * Added possibility to unpin page using pin icon
+
 CHANGELOG for 1.0.0-alpha4
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha4 versions.

UPGRADE.md

@@ -1,7 +1,7 @@
-UPGRADE FROM 1.0.0-alpha2 to 1.0.0-alpha3
+UPGRADE FROM 1.0.0-alpha versions
 =======================
 
 ### General
 
-  * Upgrade to 1.0.0-alpha3 is not supported and full reinstall is required
+  * Upgrade to any 1.0.0-alpha is not supported and full reinstall is required
 

composer.json

@@ -11,7 +11,7 @@
         "doctrine/doctrine-fixtures-bundle": "@dev",
         "twig/extensions": "1.0.*@dev",
         "symfony/assetic-bundle": "2.3.*@dev",
-        "symfony/swiftmailer-bundle": "2.3.2",
+        "symfony/swiftmailer-bundle": "2.3.*",
         "symfony/monolog-bundle": "2.3.*",
         "sensio/distribution-bundle": "2.3.*",
         "sensio/framework-extra-bundle": "2.3.*",
@@ -36,23 +36,17 @@
         "ddeboer/data-import": "dev-master",
         "stof/doctrine-extensions-bundle": "dev-master",
         "escapestudios/wsse-authentication-bundle": "2.1.x-dev",
-        "sonata-project/admin-bundle": "dev-master",
-        "sonata-project/doctrine-orm-admin-bundle": "dev-master",
         "liip/imagine-bundle": "dev-master",
         "leafo/lessphp": "dev-master",
         "willdurand/expose-translation-bundle": "0.2.*@dev",
         "apy/jsfv-bundle": "dev-master",
         "genemu/form-bundle": "2.2.*",
-        "a2lix/translation-form-bundle" : "1.0@dev"
+        "a2lix/translation-form-bundle" : "1.*@dev"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/orocrm/SonataAdminBundle.git"
-        }
-    ],
     "autoload": {
-        "psr-0": { "Oro\\Bundle": "src/" }
+        "psr-0": { 
+              "Oro\\Bundle": "src/"
+        }
     },
     "minimum-stability": "dev",
     "extra": {

phpunit.xml.dist

@@ -11,10 +11,11 @@
         processIsolation            = "false"
         stopOnFailure               = "false"
         syntaxCheck                 = "false"
-        bootstrap                   = "tests/bootstrap.php">
+        bootstrap                   = "tests/bootstrap.php"
+>
     <testsuites>
         <testsuite name="Project Unit Tests">
-            <directory suffix="Test.php">src/*/Bundle/*Bundle/Tests/Unit</directory>
+            <directory suffix="Test.php">src/Oro/Bundle/*Bundle/Tests/Unit</directory>
         </testsuite>
     </testsuites>
 

src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressController.php

@@ -2,17 +2,19 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Rest;
 
+use Symfony\Component\Form\Form;
+use Symfony\Component\HttpFoundation\Response;
+
 use FOS\RestBundle\Controller\Annotations\NamePrefix;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Controller\Annotations\QueryParam;
+use FOS\RestBundle\Routing\ClassResourceInterface;
+
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use Oro\Bundle\UserBundle\Annotation\Acl;
 
-use Symfony\Component\Form\Form;
-use Symfony\Component\HttpFoundation\Response;
-use FOS\RestBundle\Routing\ClassResourceInterface;
+use Oro\Bundle\UserBundle\Annotation\Acl;
 use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler;
-use Oro\Bundle\SoapBundle\Controller\Api\Rest\FlexibleRestController;
+use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController;
 use Oro\Bundle\AddressBundle\Entity\Manager\AddressManager;
 
 /**
@@ -25,7 +27,7 @@
  *      parent="root"
  * )
  */
-class AddressController extends FlexibleRestController implements ClassResourceInterface
+class AddressController extends RestController implements ClassResourceInterface
 {
     /**
      * REST GET list

src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressTypeController.php

@@ -44,7 +44,6 @@ class AddressTypeController extends FOSRestController implements ClassResourceIn
      */
     public function cgetAction()
     {
-        /** @var $item AddressType */
         $items = $this->getDoctrine()->getRepository('OroAddressBundle:AddressType')->findAll();
 
         return $this->handleView(

src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressController.php

@@ -5,12 +5,12 @@
 use Symfony\Component\Form\FormInterface;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 
-use Oro\Bundle\SoapBundle\Controller\Api\Soap\FlexibleSoapController;
-use Oro\Bundle\SoapBundle\Entity\Manager\ApiFlexibleEntityManager;
+use Oro\Bundle\SoapBundle\Controller\Api\Soap\SoapController;
+use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager;
 use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler;
 use Oro\Bundle\UserBundle\Annotation\AclAncestor;
 
-class AddressController extends FlexibleSoapController
+class AddressController extends SoapController
 {
     /**
      * @Soap\Method("getAddresses")
@@ -37,8 +37,8 @@ public function getAction($id)
 
     /**
      * @Soap\Method("createAddress")
-     * @Soap\Param("address", phpType = "Oro\Bundle\AddressBundle\Entity\AddressSoap")
-     * @Soap\Result(phpType = "boolean")
+     * @Soap\Param("address", phpType = "Oro\Bundle\AddressBundle\Entity\Address")
+     * @Soap\Result(phpType = "int")
      * @AclAncestor("oro_address_create")
      */
     public function createAction($address)
@@ -49,7 +49,7 @@ public function createAction($address)
     /**
      * @Soap\Method("updateAddress")
      * @Soap\Param("id", phpType = "int")
-     * @Soap\Param("address", phpType = "Oro\Bundle\AddressBundle\Entity\AddressSoap")
+     * @Soap\Param("address", phpType = "Oro\Bundle\AddressBundle\Entity\Address")
      * @Soap\Result(phpType = "boolean")
      * @AclAncestor("oro_address_edit")
      */
@@ -70,7 +70,7 @@ public function deleteAction($id)
     }
 
     /**
-     * @return ApiFlexibleEntityManager
+     * @return ApiEntityManager
      */
     public function getManager()
     {

src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php

@@ -3,19 +3,20 @@
 namespace Oro\Bundle\AddressBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation\Type;
+
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 
-use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityFlexible;
-use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface;
 use Symfony\Component\Validator\ExecutionContext;
 
 /**
  * Address
  *
  * @ORM\MappedSuperclass
+ * @ORM\HasLifecycleCallbacks
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-abstract class AbstractAddress extends AbstractEntityFlexible
+abstract class AbstractAddress implements EmptyItem
 {
     /**
      * @var integer
@@ -109,6 +110,20 @@ abstract class AbstractAddress extends AbstractEntityFlexible
      */
     protected $lastName;
 
+    /**
+     * @var \DateTime $created
+     *
+     * @ORM\Column(type="datetime")
+     */
+    protected $created;
+
+    /**
+     * @var \DateTime $updated
+     *
+     * @ORM\Column(type="datetime")
+     */
+    protected $updated;
+
     /**
      * Get id
      *
@@ -119,6 +134,16 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * Set id
+     *
+     * @param int $id
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
     /**
      * Set label
      *
@@ -145,7 +170,7 @@ public function getLabel()
     /**
      * Set street
      *
-     * @param  string      $street
+     * @param string $street
      * @return AbstractAddress
      */
     public function setStreet($street)
@@ -168,7 +193,7 @@ public function getStreet()
     /**
      * Set street2
      *
-     * @param  string      $street2
+     * @param string $street2
      * @return AbstractAddress
      */
     public function setStreet2($street2)
@@ -191,7 +216,7 @@ public function getStreet2()
     /**
      * Set city
      *
-     * @param  string      $city
+     * @param string $city
      * @return AbstractAddress
      */
     public function setCity($city)
@@ -274,7 +299,7 @@ public function getUniversalState()
     /**
      * Set postal_code
      *
-     * @param  string      $postalCode
+     * @param string $postalCode
      * @return AbstractAddress
      */
     public function setPostalCode($postalCode)
@@ -297,7 +322,7 @@ public function getPostalCode()
     /**
      * Set country
      *
-     * @param  Country     $country
+     * @param Country $country
      * @return AbstractAddress
      */
     public function setCountry($country)
@@ -374,6 +399,16 @@ public function getCreatedAt()
         return $this->created;
     }
 
+    /**
+     * Set address created date/time
+     *
+     * @param \DateTime $created
+     */
+    public function setCreatedAt(\DateTime $created)
+    {
+        $this->created = $created;
+    }
+
     /**
      * Get address last update date/time
      *
@@ -384,6 +419,16 @@ public function getUpdatedAt()
         return $this->updated;
     }
 
+    /**
+     * Set address updated date/time
+     *
+     * @param \DateTime $updated
+     */
+    public function setUpdatedAt(\DateTime $updated)
+    {
+        $this->updated = $updated;
+    }
+
     /**
      * Pre persist event listener
      *
@@ -440,7 +485,7 @@ public function __toString()
      */
     public function isEmpty()
     {
-        $isEmpty = empty($this->label)
+        return empty($this->label)
             && empty($this->firstName)
             && empty($this->lastName)
             && empty($this->street)
@@ -450,11 +495,29 @@ public function isEmpty()
             && empty($this->stateText)
             && empty($this->country)
             && empty($this->postalCode);
-        /** @var FlexibleValueInterface $value */
-        foreach ($this->values as $value) {
-            $flexibleValue = $value->getData();
-            $isEmpty = $isEmpty && empty($flexibleValue);
+    }
+
+    /**
+     * @param mixed $other
+     * @return bool
+     */
+    public function isEqual($other)
+    {
+        $class = get_class($this);
+
+        if (!$other instanceof $class) {
+            return false;
         }
-        return $isEmpty;
+
+        /** @var AbstractAddress $other */
+        if ($this->getId() && $other->getId()) {
+            return $this->getId() == $other->getId();
+        }
+
+        if ($this->getId() || $other->getId()) {
+            return false;
+        }
+
+        return $this === $other;
     }
 }