1) добавлен глобальный обработчик ошибок валидации

2) правки отправки данных 3) мелкие доработки
viktor-melnikov · Aug 18, 2017 · 8563591 · 8563591
1 parent f429111
commit 8563591
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 61 deletions.
diff --git a/src/Exceptions/RequesterException.php b/src/Exceptions/RequesterException.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: viktorthegreat
+ * Date: 25.02.17
+ * Time: 16:53
+ */
+
+namespace Requester\Exceptions;
+
+use Exception;
+
+class RequesterException extends Exception
+{
+    public $options = [];
+
+    public function __construct( $message = "", $code = 200, $options = [], Exception $previous = null )
+    {
+        if ( !empty( $options ) )
+        {
+            $this->options = $options;
+        }
+
+        $this->code    = $code == 0 ? 400 : $code;
+        $this->message = $message;
+    }
+
+    public function getOptions( $option )
+    {
+        return array_key_exists( $option, $this->options ) ? $this->options[ $option ] : null;
+    }
+}
diff --git a/src/Exceptions/ValidateInputException.php b/src/Exceptions/ValidateInputException.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: viktorthegreat
+ * Date: 25.02.17
+ * Time: 16:53
+ */
+
+namespace Requester\Exceptions;
+
+class ValidateInputException extends RequesterException
+{
+}
diff --git a/src/Handler/CacheLogHandler.php b/src/Handler/CacheLogHandler.php
@@ -63,7 +63,8 @@ public function initializeCache()
 
         //если логгер был инициализирован прежде кэша, значит пропихнем его туда.
         //в противном случае логи все равно выключены.
-        if ( $this->log instanceof LoggerAbstract ) {
+        if ( $this->log instanceof LoggerAbstract )
+        {
             $this->cache->setLogger( $this->log->getLogger() );
         }
 
@@ -81,13 +82,16 @@ public function initializeCache()
      */
     public function searchAlias( $alias, array $aliases = [] )
     {
-        if ( isset( $aliases[ $alias ] ) ) {
+        if ( isset( $aliases[ $alias ] ) )
+        {
             $ttl = $aliases[ $alias ];
         }
-        else if ( array_search( $alias, (array)$aliases )!==false ) {
+        else if ( array_search( $alias, (array)$aliases ) !== false )
+        {
             $ttl = 3600;
         }
-        else {
+        else
+        {
             return false;
         }
 
@@ -113,11 +117,13 @@ public function beforeExecute()
      */
     public function beforeExecuteReturn()
     {
-        if ( $this->request->config->has( 'cache.aliases' ) && array_key_exists( $this->request->alias, $this->request->config->get( 'cache.aliases' )->toArray() ) ) {
+        if ( $this->request->config->has( 'cache.aliases' ) && array_key_exists( $this->request->alias, $this->request->config->get( 'cache.aliases' )->toArray() ) )
+        {
 
             $item = $this->cache->getItem( $this->request->alias );
 
-            if ( !$item->isMiss() ) {
+            if ( !$item->isMiss() )
+            {
 
                 return $item->get();
             }
@@ -128,11 +134,13 @@ public function beforeExecuteReturn()
 
     public function afterExecuteReturn( $body )
     {
-        if ( $this->request->config->has( 'cache.aliases' ) && array_key_exists( $this->request->alias, $this->request->config->get( 'cache.aliases' )->toArray() ) ) {
+        if ( $this->request->config->has( 'cache.aliases' ) && array_key_exists( $this->request->alias, $this->request->config->get( 'cache.aliases' )->toArray() ) )
+        {
 
             $hasSubqueryOrLifetime = $this->searchAlias( $this->request->alias, $this->request->config->get( 'cache.aliases' )->toArray() );
 
-            if ( $hasSubqueryOrLifetime ) {
+            if ( $hasSubqueryOrLifetime )
+            {
                 $item = $this->cache->getItem( $this->request->alias );
 
                 $this->cache->save( $item->expiresAfter( $hasSubqueryOrLifetime )->set( $body ) );
@@ -181,14 +189,14 @@ private function getLogDefaultConfig()
     {
         return [
             'channel' => 'no_channel',
-            'path'    => storage_path( 'logs' ),
+            'path'    => app( 'path.storage' ) . 'logs',
         ];
     }
 
     private function getCacheDefaultConfig()
     {
         return [
-            'path'    => storage_path( 'cache' ),
+            'path' => app( 'path.storage' ) . 'cache',
         ];
     }
 }
diff --git a/src/HelperFormatter.php b/src/HelperFormatter.php
@@ -10,21 +10,22 @@
 
 use DateTime;
 use IntlDateFormatter;
+use Requester\Exceptions\ValidateInputException;
 
 class HelperFormatter
 {
-    public function formatDate($date, $pattern = '')
+    public function formatDate( $date, $pattern = '' )
     {
-        if( ! $date instanceof DateTime)
+        if ( !$date instanceof DateTime )
         {
-            $date = new DateTime($date);
+            $date = new DateTime( $date );
         }
 
-        $intl = ( new IntlDateFormatter('ru_RU', IntlDateFormatter::FULL, IntlDateFormatter::FULL, 'Europe/Moscow') );
+        $intl = ( new IntlDateFormatter( 'ru_RU', IntlDateFormatter::FULL, IntlDateFormatter::FULL, 'Europe/Moscow' ) );
 
-        $intl->setPattern($pattern);
+        $intl->setPattern( $pattern );
 
-        return $intl->format($date);
+        return $intl->format( $date );
     }
 
     public function getNoun( $num, $one, $two, $five )
@@ -50,19 +51,6 @@ public function getNoun( $num, $one, $two, $five )
         return $five;
     }
 
-    public function getAdj( $num, $one, $two )
-    {
-        $num %= 100;
-
-        if($num == 11) return $two;
-
-        $num %= 10;
-
-        if($num == 1) return $one;
-
-        return $two;
-    }
-
     /**
      * Форматирование телефонного номера (убираем все спец символы и оставляем только цифры)
      *
@@ -84,14 +72,25 @@ public static function clearAllSymbols( $string )
      * @param string $phone
      *
      * @return bool|string
+     * @throws ValidateInputException
      * @internal param array|string $format
      */
     public static function phone_format( $phone )
     {
         $phone = preg_replace( '/[^0-9]/', '', $phone );
 
-        if ( !empty($phone) && $phone[ 0 ]=='8' ) {
-            $phone[ 0 ] = '7';
+        if ( strlen( $phone ) < 10 )
+        {
+            throw new ValidateInputException( null, 400, [ 'error_code' => 14, 'error_params' => [ 'номер телефона' ] ] );
+        }
+
+        if ( !empty( $phone ) && strlen( $phone ) == 11 && $phone[0] == '8' )
+        {
+            $phone[0] = '7';
+        }
+        elseif ( strlen( $phone ) == 10 )
+        {
+            $phone = '7' . $phone;
         }
 
         return $phone;