Merge branch 'master' into bugfix/core-2209-email-validation-on-newsl…

…etter-subscription-and-guest-form
spryker · Nov 30, 2017 · 9207a0b · 9207a0b
2 parents 67b2b13 + 2d5d58a
commit 9207a0b
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 452 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     "spryker/kernel": "^3.0.0",
     "spryker/locale": "^3.0.0",
     "spryker/mail": "^4.0.0",
-    "spryker/propel-orm": "^1.0.0",
+    "spryker/propel-orm": "^1.5.0",
     "spryker/sequence-number": "^3.0.0",
     "spryker/session": "^3.0.0",
     "spryker/symfony": "^3.0.0",

diff --git a/src/Spryker/Client/Customer/CustomerClient.php b/src/Spryker/Client/Customer/CustomerClient.php
@@ -16,29 +16,6 @@
  */
 class CustomerClient extends AbstractClient implements CustomerClientInterface
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @api
-     *
-     * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
-     *
-     * @return bool
-     */
-    public function hasCustomerWithEmailAndPassword(CustomerTransfer $customerTransfer)
-    {
-        $customerResponseTransfer = $this->getFactory()
-            ->createZedCustomerStub()
-            ->hasCustomerWithEmailAndPassword($customerTransfer);
-
-        $hasCustomer = $customerResponseTransfer->getHasCustomer();
-        if ($hasCustomer === true) {
-            $this->setCustomer($customerResponseTransfer->getCustomerTransfer());
-        }
-
-        return $hasCustomer;
-    }
-
     /**
      * {@inheritdoc}
      *

diff --git a/src/Spryker/Client/Customer/CustomerClientInterface.php b/src/Spryker/Client/Customer/CustomerClientInterface.php
@@ -12,19 +12,6 @@
 
 interface CustomerClientInterface
 {
-    /**
-     * Specification:
-     * - Checks if customer exists in persistent storage by provided email and plain text password.
-     * - Stores found customer information in session.
-     *
-     * @api
-     *
-     * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
-     *
-     * @return bool
-     */
-    public function hasCustomerWithEmailAndPassword(CustomerTransfer $customerTransfer);
-
     /**
      * Specification:
      * - Checks if customer exists in persistent storage by provided email and plain text password.

diff --git a/src/Spryker/Shared/Customer/CustomerConstants.php b/src/Spryker/Shared/Customer/CustomerConstants.php
@@ -12,11 +12,9 @@ interface CustomerConstants
     const CUSTOMER_ANONYMOUS_PATTERN = 'CUSTOMER_ANONYMOUS_PATTERN';
     const CUSTOMER_SECURED_PATTERN = 'CUSTOMER_SECURED_PATTERN';
 
-    /** @deprecated Use CustomerConstants::BASE_URL_YVES instead */
-    const HOST_YVES = 'HOST_YVES';
-
     /**
-     * Base URL for Yves including scheme and port (e.g. http://www.de.demoshop.local:8080)
+     * Specification:
+     * - Base URL for Yves including scheme and port (e.g. http://www.de.demoshop.local:8080)
      *
      * @api
      */

diff --git a/src/Spryker/Zed/Customer/Business/Anonymizer/CustomerAnonymizer.php b/src/Spryker/Zed/Customer/Business/Anonymizer/CustomerAnonymizer.php
@@ -47,8 +47,7 @@ class CustomerAnonymizer implements CustomerAnonymizerInterface
      * @param array $customerAnonymizerPlugins
      */
     public function __construct(
-        CustomerQueryContainerInterface
-        $customerQueryContainer,
+        CustomerQueryContainerInterface $customerQueryContainer,
         CustomerInterface $customerModel,
         AddressInterface $addressModel,
         array $customerAnonymizerPlugins

diff --git a/src/Spryker/Zed/Customer/Business/Customer/Address.php b/src/Spryker/Zed/Customer/Business/Customer/Address.php
@@ -15,7 +15,6 @@
 use Orm\Zed\Customer\Persistence\SpyCustomerAddress;
 use Propel\Runtime\Collection\ObjectCollection;
 use Spryker\Zed\Customer\Business\Exception\AddressNotFoundException;
-use Spryker\Zed\Customer\Business\Exception\CountryNotFoundException;
 use Spryker\Zed\Customer\Business\Exception\CustomerNotFoundException;
 use Spryker\Zed\Customer\Dependency\Facade\CustomerToCountryInterface;
 use Spryker\Zed\Customer\Dependency\Facade\CustomerToLocaleInterface;
@@ -352,22 +351,13 @@ protected function getCustomerFromCustomerTransfer(CustomerTransfer $customerTra
     }
 
     /**
-     * @throws \Spryker\Zed\Customer\Business\Exception\CountryNotFoundException
-     *
      * @return int
      */
     protected function getCustomerCountryId()
     {
-        $idCountry = $this->countryFacade->getIdCountryByIso2Code($this->getIsoCode());
-
-        if ($idCountry === null) {
-            throw new CountryNotFoundException(sprintf(
-                'Country not found for ISO code `%s`.',
-                $this->getIsoCode()
-            ));
-        }
+        $countryTransfer = $this->countryFacade->getCountryByIso2Code($this->getIsoCode());
 
-        return $idCountry;
+        return $countryTransfer->getIdCountry();
     }
 
     /**
@@ -465,7 +455,8 @@ protected function retrieveFkCountry(AddressTransfer $addressTransfer)
         if (empty($fkCountry)) {
             $iso2Code = $addressTransfer->getIso2Code();
             if (empty($iso2Code) === false) {
-                $fkCountry = $this->countryFacade->getIdCountryByIso2Code($iso2Code);
+                $countryTransfer = $this->countryFacade->getCountryByIso2Code($iso2Code);
+                $fkCountry = $countryTransfer->getIdCountry();
             } else {
                 $fkCountry = $this->getCustomerCountryId();
             }

diff --git a/src/Spryker/Zed/Customer/Business/CustomerFacade.php b/src/Spryker/Zed/Customer/Business/CustomerFacade.php
@@ -83,22 +83,6 @@ public function confirmRegistration(CustomerTransfer $customerTransfer)
             ->confirmRegistration($customerTransfer);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @api
-     *
-     * @deprecated Use CustomerFacade::sendPasswordRestoreMail() instead
-     *
-     * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
-     *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
-     */
-    public function forgotPassword(CustomerTransfer $customerTransfer)
-    {
-        return $this->sendPasswordRestoreMail($customerTransfer);
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -431,7 +415,7 @@ public function tryAuthorizeCustomerByEmailAndPassword(CustomerTransfer $custome
      */
     public function saveCustomerForOrder(
         QuoteTransfer $quoteTransfer,
-        CheckoutResponseTransfer  $checkoutResponseTransfer
+        CheckoutResponseTransfer $checkoutResponseTransfer
     ) {
         $this->getFactory()->createCustomerOrderSaver()->saveOrder($quoteTransfer, $checkoutResponseTransfer);
     }
@@ -448,7 +432,7 @@ public function saveCustomerForOrder(
      */
     public function checkOrderPreSaveConditions(
         QuoteTransfer $quoteTransfer,
-        CheckoutResponseTransfer  $checkoutResponseTransfer
+        CheckoutResponseTransfer $checkoutResponseTransfer
     ) {
         $this->getFactory()
             ->createPreConditionChecker()

diff --git a/src/Spryker/Zed/Customer/Business/CustomerFacadeInterface.php b/src/Spryker/Zed/Customer/Business/CustomerFacadeInterface.php
@@ -74,20 +74,6 @@ public function registerCustomer(CustomerTransfer $customerTransfer);
      */
     public function confirmRegistration(CustomerTransfer $customerTransfer);
 
-    /**
-     * Specification:
-     * - Sends password restoration link via email using a freshly generated password restoration key.
-     *
-     * @api
-     *
-     * @deprecated Use sendPasswordRestoreMail() instead
-     *
-     * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
-     *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
-     */
-    public function forgotPassword(CustomerTransfer $customerTransfer);
-
     /**
      * Specification:
      * - Sends password restoration link via email using a freshly generated password restoration key.
@@ -365,7 +351,7 @@ public function tryAuthorizeCustomerByEmailAndPassword(CustomerTransfer $custome
      */
     public function saveCustomerForOrder(
         QuoteTransfer $quoteTransfer,
-        CheckoutResponseTransfer  $checkoutResponseTransfer
+        CheckoutResponseTransfer $checkoutResponseTransfer
     );
 
     /**
@@ -382,7 +368,7 @@ public function saveCustomerForOrder(
      */
     public function checkOrderPreSaveConditions(
         QuoteTransfer $quoteTransfer,
-        CheckoutResponseTransfer  $checkoutResponseTransfer
+        CheckoutResponseTransfer $checkoutResponseTransfer
     );
 
     /**

diff --git a/src/Spryker/Zed/Customer/Business/Exception/CountryNotFoundException.php b/src/Spryker/Zed/Customer/Business/Exception/CountryNotFoundException.php
diff --git a/src/Spryker/Zed/Customer/Communication/Controller/AddController.php b/src/Spryker/Zed/Customer/Communication/Controller/AddController.php
@@ -46,12 +46,4 @@ public function indexAction(Request $request)
             'form' => $form->createView(),
         ]);
     }
-
-    /**
-     * @return \Generated\Shared\Transfer\CustomerTransfer
-     */
-    protected function createCustomerTransfer()
-    {
-        return new CustomerTransfer();
-    }
 }
diff --git a/src/Spryker/Zed/Customer/Communication/Controller/AddressController.php b/src/Spryker/Zed/Customer/Communication/Controller/AddressController.php
@@ -18,84 +18,6 @@
  */
 class AddressController extends AbstractController
 {
-    /**
-     * @deprecated moved to Customer view page ViewController->indexAction()
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return array
-     */
-    public function indexAction(Request $request)
-    {
-        $idCustomerRaw = $request->get(CustomerConstants::PARAM_ID_CUSTOMER);
-
-        if (empty($idCustomerRaw)) {
-            return $this->redirectResponse('/customer');
-        }
-
-        $idCustomer = $this->castId($idCustomerRaw);
-
-        $table = $this->getFactory()
-            ->createCustomerAddressTable($idCustomer);
-
-        return $this->viewResponse([
-            'addressTable' => $table->render(),
-            'idCustomer' => $idCustomer,
-        ]);
-    }
-
-    /**
-     * @deprecated moved to Customer view page ViewController->indexAction()
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return \Symfony\Component\HttpFoundation\JsonResponse
-     */
-    public function tableAction(Request $request)
-    {
-        $idCustomer = $this->castId($request->get(CustomerConstants::PARAM_ID_CUSTOMER));
-
-        $table = $this->getFactory()
-            ->createCustomerAddressTable($idCustomer);
-
-        return $this->jsonResponse($table->fetchData());
-    }
-
-    /**
-     * @deprecated Address has no detail page anymore
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return array
-     */
-    public function viewAction(Request $request)
-    {
-        $idCustomer = false;
-        $idCustomerAddress = $this->castId($request->get(CustomerConstants::PARAM_ID_CUSTOMER_ADDRESS));
-
-        $customerAddress = $this->createCustomerAddressTransfer();
-        $customerAddress->setIdCustomerAddress($idCustomerAddress);
-
-        $addressDetails = $this->getFacade()
-            ->getAddress($customerAddress);
-
-        if (empty($addressDetails) === false) {
-            $idCustomer = $addressDetails->getFkCustomer();
-        }
-
-        $customerAddressTransfer = $this->createCustomerAddressTransfer();
-        $customerAddressTransfer->setIdCustomerAddress($idCustomerAddress);
-
-        $address = $this->getFacade()
-            ->getAddress($customerAddressTransfer);
-
-        return $this->viewResponse([
-            'address' => $address->toArray(),
-            'idCustomer' => $idCustomer,
-            'idCustomerAddress' => $idCustomerAddress,
-        ]);
-    }
-
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
      *