Merge pull request #436 from phalcon/3.x

3.x

Author: sergeyklay

app/library/Mail/SendSpool.php

@@ -36,13 +36,12 @@ class SendSpool extends Injectable
     public function sendRemaining()
     {
         $notifications = Notifications::find([
-            'conditions' => 'sent = ?1 AND created_at < ?2',
+            'conditions' => 'sent = ?1 AND UNIX_TIMESTAMP() - created_at <= ?2',
             'order'      => 'created_at DESC',
             'limit'      => 1000,
             'bind'       => [
-                1 => Notifications::STATUS_NOT_SENT,
-                // Max 7 days
-                2 => time() - 7 * 24 * 60 * 60,
+                1 => Notifications::STATUS_NOT_SENT, // Only unsent messages
+                2 => 7 * 24 * 60 * 60,               // For last 7 days
             ],
         ]);
 

app/library/Version.php

@@ -35,6 +35,6 @@ class Version extends PhVersion
     protected static function _getVersion()
     {
         // @codingStandardsIgnoreEnd
-        return [3, 4, 0, 0, 0];
+        return [3, 4, 1, 0, 0];
     }
 }

app/model/Posts.php

@@ -273,29 +273,34 @@ public function afterSave()
     {
         $this->clearCache();
 
+        if (!container()->has('session')) {
+            return;
+        }
+
+        if (!container('session')->isStarted()) {
+            return;
+        }
+
         // In case of updating post through creating PostsViews
-        if (!$this->getDI()->getShared('session')->has('identity')) {
+        if (!container('session')->has('identity')) {
             return;
         }
 
         $history = new PostsHistory([
             'posts_id' => $this->id,
-            'users_id' => $this->getDI()->getShared('session')->get('identity'),
+            'users_id' => container('session')->get('identity'),
             'content'  => $this->content,
         ]);
 
         if (!$history->save()) {
-            /** @var \Phalcon\Logger\AdapterInterface $logger */
-            $logger   = $this->getDI()->get('logger');
-            $messages = $history->getMessages();
             $reason   = [];
 
-            foreach ($messages as $message) {
+            foreach ($history->getMessages() as $message) {
                 /** @var \Phalcon\Mvc\Model\MessageInterface $message */
                 $reason[] = $message->getMessage();
             }
 
-            $logger->error('Unable to store post history. Post id: {id}. Reason: {reason}', [
+            container('logger')->error('Unable to store post history. Post id: {id}. Reason: {reason}', [
                 'id'     => $this->id,
                 'reason' => implode('. ', $reason)
             ]);

app/model/PostsReplies.php

@@ -248,10 +248,14 @@ public function afterSave()
     {
         $this->clearCache();
 
+        $usersId = $this->users_id;
+        if (container()->has('session') && container('session')->isStarted() && container('session')->has('identity')) {
+            $usersId = container('session')->get('identity');
+        }
+
         $history                   = new PostsRepliesHistory();
         $history->posts_replies_id = $this->id;
-        $usersId                   = $this->getDI()->getSession()->get('identity');
-        $history->users_id         = $usersId ? $usersId : $this->users_id;
+        $history->users_id         = $usersId;
         $history->content          = $this->content;
 
         $history->save();

config/session.php

@@ -14,6 +14,10 @@
                     'weight' => env('MEMCACHED_WEIGHT', 100),
                 ]
             ],
+            // Client options must be instance of array
+            'client' => [
+
+            ],
         ],
 
         'redis' => [

tests/console/HelpCept.php

@@ -8,7 +8,7 @@
 $I->wantToTest('getting help from command line');
 
 $output=<<<OUT
-Phosphorum 3.4.0
+Phosphorum 3.4.1
 Usage: php forum [command <arguments>] [--help | -H] [--version | -V] [--list]
 OUT;
 

tests/console/NotificationsCest.php

@@ -113,10 +113,7 @@ public function checkNotifications(ConsoleTester $I)
         ];
 
         if (!isset($this->messages[0]) || empty($this->messages)) {
-            // FIXME:
-            throw new PHPUnit_Framework_SkippedTestError(
-                "Failed to test notifications.\n" . var_export($this->messages, true)
-            );
+            $I->fail("Failed to test notifications.\n" . print_r($this->messages, true));
         }
 
         $message = $this->messages[0];

tests/console/VersionCept.php

@@ -11,7 +11,7 @@
 $sha = substr(trim($I->runShellCommand('git rev-parse HEAD')), 0, 7);
 
 $output=<<<OUT
-Phosphorum version 3.4.0, git commit $sha
+Phosphorum version 3.4.1, git commit $sha
 OUT;
 
 $I->runShellCommand('php forum -V');