update

classes/checkout/CheckoutPersonalInformationStep.php

@@ -1,11 +1,12 @@
 <?php
 /**
- * 2007-2018 PrestaShop.
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
  *
  * NOTICE OF LICENSE
  *
  * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
+ * that is bundled with this package in the file LICENSE.md.
  * It is also available through the world-wide-web at this URL:
  * https://opensource.org/licenses/OSL-3.0
  * If you did not receive a copy of the license and are unable to
@@ -16,12 +17,11 @@
  *
  * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
  * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
  *
- * @author    PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2018 PrestaShop SA
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -44,10 +44,10 @@ class CheckoutPersonalInformationStepCore extends AbstractCheckoutStep
         $this->registerForm = $registerForm;
     }
 
-    public function handleRequest(array $requestParameters = array())
+    public function handleRequest(array $requestParameters = [])
     {
         // personal info step is always reachable
-        $this->step_is_reachable = true;
+        $this->setReachable(true);
 
         $this->registerForm
             ->fillFromCustomer(
@@ -55,60 +55,62 @@ class CheckoutPersonalInformationStepCore extends AbstractCheckoutStep
                     ->getCheckoutProcess()
                     ->getCheckoutSession()
                     ->getCustomer()
-            )
-        ;
+            );
 
         if (isset($requestParameters['submitCreate'])) {
             $this->registerForm->fillWith($requestParameters);
             if ($this->registerForm->submit()) {
-                $this->step_is_complete = true;
+                $this->setNextStepAsCurrent();
+                $this->setComplete(true);
             } else {
-                $this->step_is_complete = false;
+                $this->setComplete(false);
                 $this->setCurrent(true);
                 $this->getCheckoutProcess()->setHasErrors(true)->setNextStepReachable();
             }
         } elseif (isset($requestParameters['submitLogin'])) {
             $this->loginForm->fillWith($requestParameters);
             if ($this->loginForm->submit()) {
-                $this->step_is_complete = true;
+                $this->setNextStepAsCurrent();
+                $this->setComplete(true);
             } else {
                 $this->getCheckoutProcess()->setHasErrors(true);
                 $this->show_login_form = true;
             }
         } elseif (array_key_exists('login', $requestParameters)) {
             $this->show_login_form = true;
-            $this->step_is_current = true;
+            $this->setCurrent(true);
         }
 
         $this->logged_in = $this
             ->getCheckoutProcess()
             ->getCheckoutSession()
-            ->customerHasLoggedIn()
-        ;
+            ->customerHasLoggedIn();
 
         if ($this->logged_in && !$this->getCheckoutSession()->getCustomer()->is_guest) {
-            $this->step_is_complete = true;
+            $this->setComplete(true);
         }
 
         $this->setTitle(
             $this->getTranslator()->trans(
                 'Personal Information',
-                array(),
+                [],
                 'Shop.Theme.Checkout'
             )
         );
     }
 
-    public function render(array $extraParams = array())
+    public function render(array $extraParams = [])
     {
         return $this->renderTemplate(
-            $this->getTemplate(), $extraParams, array(
+            $this->getTemplate(),
+            $extraParams,
+            [
                 'show_login_form' => $this->show_login_form,
                 'login_form' => $this->loginForm->getProxy(),
                 'register_form' => $this->registerForm->getProxy(),
                 'guest_allowed' => $this->getCheckoutSession()->isGuestAllowed(),
                 'empty_cart_on_logout' => !Configuration::get('PS_CART_FOLLOWING'),
-            )
+            ]
         );
     }
 }