Merge pull request #382 from sergeyklay/3.x

3.x

Author: sergeyklay

.gitignore

@@ -6,7 +6,6 @@
 # https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
 
 /vendor
-.env
+/.env
 /public/robots.txt
 /public/sitemap.xml
-!.env.example

app/model/Posts.php

@@ -260,10 +260,10 @@ public function afterCreate()
              * Queue notifications to be sent
              */
             /** @var Beanstalk $queue */
-            $queue = $this->getDI()->getShared('queue');
+            $queue = container('queue');
             $queue->choose('notifications');
             /** @var DiscordComponent $discord */
-            $discord = $this->getDI()->getShared('discord');
+            $discord = container('discord');
             $queue->put($toNotify);
             $discord->addMessageAboutDiscussion($this);
         }

app/model/PostsReplies.php

@@ -235,11 +235,11 @@ public function afterCreate()
              * Queue notifications to be sent
              */
             /** @var Beanstalk $queue */
-            $queue = $this->getDI()->getShared('queue');
+            $queue = container('queue');
             $queue->choose('notifications');
             $queue->put($toNotify);
             /** @var DiscordComponent $discord */
-            $discord = $this->getDI()->getShared('discord');
+            $discord = container('discord');
             $discord->addMessageAboutReply($this);
         }
     }
@@ -257,7 +257,7 @@ public function afterSave()
         $history->save();
         if ($this->hasUpdated('accepted') && $this->accepted == 'Y') {
             /** @var DiscordComponent $discord */
-            $discord = $this->getDI()->getShared('discord');
+            $discord = container('discord');
             $discord->addMessageAboutSolvedDiscussion($this);
         }
     }

app/provider/ErrorHandler/ServiceProvider.php

@@ -65,8 +65,6 @@ function () {
             $this->serviceName,
             function () use ($service) {
                 $run  = new Run();
-                $run->pushHandler(container("{$service}.loggerHandler"));
-
                 $mode = container('bootstrap')->getMode();
 
                 switch ($mode) {
@@ -95,6 +93,8 @@ function () use ($service) {
                         );
                 }
 
+                $run->pushHandler(container("{$service}.loggerHandler"));
+
                 return $run;
             }
         );

app/provider/Queue/Fake.php

@@ -61,6 +61,6 @@ public function peekReady()
 
     public function choose($tube)
     {
-        singleton('logger')->debug('Chosen tube: $tube');
+        singleton('logger')->debug("Chosen tube: {$tube}");
     }
 }