Shop module rewrite

Yii.php

@@ -27,6 +27,7 @@ abstract class BaseApplication extends yii\base\Application
  * Include only Web application related components here
  *
  * @property \core\components\modules\ModuleManager $moduleManager Module manager
+ * @property \yii\db\Query $queue
  *
  * @property \core\entities\user\User $user The user component. This property is read-only. Extended component.
  * @ property \app\components\MyResponse $response The response component. This property is read-only. Extended component.

core/components/LanguageTranslateTrait.php

@@ -21,6 +21,7 @@ trait LanguageTranslateTrait
      * @var string the name of the lang field of the translation table. Default to 'language'.
      */
     public $languageField = 'language';
+
     /**
      * Scope for querying by languages
      *
@@ -33,13 +34,17 @@ trait LanguageTranslateTrait
     {
         $language = $language ?: Yii::$app->language;
         if (!isset($this->with['translations'])) {
-			$this->with(['translation' => function ($query) use ($language, $abridge) {
+            $this->with([
+                'translation' => function ($query) use ($language, $abridge) {
                     /** @var ActiveQuery $query */
                     $query->where([$this->languageField => $abridge ? substr($language, 0, 2) : $language]);
-			}]);
                 }
+            ]);
+        }
+
         return $this;
     }
+
     /**
      * Scope for querying by all languages
      * @return $this
@@ -50,6 +55,7 @@ trait LanguageTranslateTrait
             unset($this->with['translation']);
         }
         $this->with('translations');
+
         return $this;
     }
 }

core/events/EventTrait.php

@@ -4,17 +4,17 @@ namespace core\events;
 
 trait EventTrait
 {
-    private $events = [];
+    private $_events = [];
 
-    protected function recordEvent($event): void
+    public function recordEvent($event): void
     {
-        $this->events[] = $event;
+        $this->_events[] = $event;
     }
 
     public function releaseEvents(): array
     {
-        $events = $this->events;
-        $this->events = [];
+        $events = $this->_events;
+        $this->_events = [];
         return $events;
     }
 }

core/helpers/PhoneHelper.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 23.09.2018
+ */
+
+namespace core\helpers;
+
+class PhoneHelper
+{
+    public static function normalizePhone(string $phone): string
+    {
+        return preg_replace('/[^0-9]/', '', $phone);
+    }
+
+    public static function isCorrect(string $phone): bool
+    {
+        $string = PhoneHelper::normalizePhone($phone);
+        return strlen($string) == 11;
+    }
+}