Start migration to ZF2/3

autowp · Jun 19, 2016 · 3073c9c · 3073c9c
1 parent 052cd76
commit 3073c9c
Show file tree

Hide file tree

Showing 75 changed files with 8,313 additions and 1,274 deletions.
diff --git a/application/models/Cars/Row.php b/application/models/Cars/Row.php
@@ -19,11 +19,11 @@ private function getSpecTable()
 
     private static function buildYearsString(array $options)
     {
-        $defaults = array(
+        $defaults = [
             'begin_year' => null,
             'end_year'   => null,
             'today'      => null
-        );
+        ];
         $options = array_replace($defaults, $options);
 
         $result = '';

diff --git a/application/models/Comments.php b/application/models/Comments.php
@@ -135,7 +135,7 @@ private function _get($type, $item, $parentId, $userId, $perPage = 0, $page = 0)
         if ($userId instanceof Users_Row) {
             $userId = $userId->id;
         }
-        
+
         if ($perPage) {
 
             $paginator = $this->getPaginator($type, $item, $perPage, $page);
@@ -503,8 +503,8 @@ public function updateRepliesCount()
                 using(type_id, item_id, id)
             set comments_messages.replies_count = __cms.count
         ');
-        
-        return $affected;
+
+        return $affected->rowCount();
     }
 
     private function _moveMessageRecursive($parentId, $newTypeId, $newItemId)

diff --git a/application/modules/api/controllers/ContactController.php b/application/modules/api/controllers/ContactController.php
diff --git a/application/modules/api/controllers/PictureController.php b/application/modules/api/controllers/PictureController.php
diff --git a/application/modules/default/controllers/UsersController.php b/application/modules/default/controllers/UsersController.php
@@ -94,9 +94,9 @@ public function userAction()
         $uaRows = $uaTable->fetchAll(array(
             'user_id = ?' => $user->id
         ));
-        
+
         $contact = new Contact();
-        
+
         $currentUser = $this->_helper->user()->get();
         $isMe = $currentUser && ($currentUser->id == $user->id);
         $inContacts = $currentUser && !$isMe && $contact->exists($currentUser->id, $user->id);
@@ -112,12 +112,7 @@ public function userAction()
             'accounts'        => $uaRows,
             'inContacts'      => $inContacts,
             'canBeInContacts' => $canBeInContacts,
-            'contactApiUrl'   => $this->_helper->url->url([
-                'module'     => 'api',
-                'controller' => 'contact',
-                'action'     => 'user',
-                'user_id'    => $user->id
-            ], 'default', true)
+            'contactApiUrl'   => sprintf('/api/contacts/%d', $user->id)
         ));
 
     }
@@ -147,15 +142,15 @@ public function picturesAction()
 
         // СПИСОК БРЕНДОВ
         $brandModel = new Brand();
-        
+
         $options = [
             'language' => $this->_helper->language(),
             'columns'  => [
                 'img',
                 'pictures_count' => new Zend_Db_Expr('COUNT(distinct pictures.id)')
             ]
         ];
-        
+
         $rows = $brandModel->getList($options, function($select) use ($user) {
             $select
                 ->join('brands_cars', 'brands.id = brands_cars.brand_id', null)
@@ -207,7 +202,7 @@ public function brandpicturesAction()
         if (!$user) {
             return $this->_forward('notfound', 'error');
         }
-        
+
         $language = $this->_helper->language();
 
         $brandModel = new Brand();

diff --git a/application/services/Telegram.php b/application/services/Telegram.php
@@ -125,14 +125,14 @@ public function notifyInbox($pictureId)
             $router = Zend_Controller_Front::getInstance()->getRouter();
 
             foreach ($rows as $row) {
-                $url = $router->assemble(array(
+                $url = $router->assemble([
                     'picture_id' => $picture->identity ? $picture->identity : $picture->id,
-                ), 'picture', true);
+                ], 'picture', true);
 
-                $this->sendMessage(array(
+                $this->sendMessage([
                     'text'    => 'http://autowp.ru' . $url,
                     'chat_id' => $row['chat_id']
-                ));
+                ]);
             }
         }
     }

diff --git a/application/services/TrafficControl.php b/application/services/TrafficControl.php
@@ -443,4 +443,17 @@ public function autoWhitelist()
             print PHP_EOL;
         }
     }
+
+    public function gc()
+    {
+        $count = $this->_getMonitoringTable()->delete([
+            'day_date < CURDATE()'
+        ]);
+
+        $count += $this->_getBannedTable()->delete(
+            'up_to < NOW()'
+        );
+
+        return $count;
+    }
 }
diff --git a/composer.json b/composer.json
@@ -29,7 +29,16 @@
         "autowp/external-login-service": "^1.0",
         "zendframework/zend-uri": "^2.5",
         "zendframework/zend-db": "^2.7",
-        "twitter/typeahead.js": "^0.11.1"
+        "twitter/typeahead.js": "^0.11.1",
+        "zendframework/zend-mvc": "^3.0",
+        "zendframework/zend-mvc-i18n": "^1.0",
+        "zendframework/zend-mvc-plugin-flashmessenger": "^1.0",
+        "zendframework/zend-i18n": "^2.7",
+        "zendframework/zend-paginator": "^2.7",
+        "zendframework/zend-view": "^2.7",
+        "zendframework/zend-mvc-console": "^1.1",
+        "zendframework/zend-form": "^2.9",
+        "zendframework/zend-captcha": "^2.5"
     },
     "authors": [
         {
@@ -47,7 +56,14 @@
             "Application\\Model\\": "application/models",
             "Application\\Model\\DbTable\\": "application/models/DbTable",
             "Application\\Service\\": "application/services"
-        }
+        },
+        "classmap": [
+            "application/models/",
+            "application/forms/",
+            "application/services/",
+            "library/Project/Form/Element/",
+            "library/Project/Telegram"
+        ]
     },
     "require-dev": {
         "phpunit/PHPUnit": "~4.0"