minor symfony#19265 Fixed problems found by SensioLabsInsight (fabpot)

This PR was merged into the 3.2-dev branch.

Discussion
----------

Fixed problems found by SensioLabsInsight

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

1bd6da6 fixed problems found by SensioLabsInsight

Author: fabpot

src/Symfony/Component/Cache/Adapter/RedisAdapterTrait.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Predis\Connection\Aggregate\RedisCluster;
+use Predis\Connection\Aggregate\PredisCluster;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
 /**

src/Symfony/Component/Console/Application.php

@@ -693,7 +693,7 @@ public function renderException(\Exception $e, OutputInterface $output)
      */
     protected function getTerminalWidth()
     {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->terminal->getWidth();
     }
@@ -707,7 +707,7 @@ protected function getTerminalWidth()
      */
     protected function getTerminalHeight()
     {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->terminal->getHeight();
     }
@@ -721,7 +721,7 @@ protected function getTerminalHeight()
      */
     public function getTerminalDimensions()
     {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__), E_USER_DEPRECATED);
 
         return array($this->terminal->getWidth(), $this->terminal->getHeight());
     }
@@ -740,7 +740,7 @@ public function getTerminalDimensions()
      */
     public function setTerminalDimensions($width, $height)
     {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Set the COLUMNS and LINES env vars instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Set the COLUMNS and LINES env vars instead.', __METHOD__), E_USER_DEPRECATED);
 
         putenv('COLUMNS='.$width);
         putenv('LINES='.$height);

src/Symfony/Component/Console/Terminal.php

@@ -60,7 +60,7 @@ private static function initDimensions()
                 // or [w, h] from "wxh"
                 self::$width = (int) $matches[1];
                 self::$height = isset($matches[4]) ? (int) $matches[4] : (int) $matches[2];
-            } elseif (null != $dimensions = self::getConsoleMode()) {
+            } elseif (null !== $dimensions = self::getConsoleMode()) {
                 // extract [w, h] from "wxh"
                 self::$width = (int) $dimensions[0];
                 self::$height = (int) $dimensions[1];