allow this bundle to work with symfony3

Elao · Dec 1, 2015 · ef5b5be · ef5b5be
1 parent a312af0
commit ef5b5be
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 31 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -27,7 +27,9 @@ public function getConfigTreeBuilder()
                 ->arrayNode('to')
                     ->beforeNormalization()
                     ->ifString()
-                        ->then(function($value) { return array($value); })
+                        ->then(function ($value) {
+                            return array($value);
+                        })
                     ->end()
                     ->isRequired()
                     ->cannotBeEmpty()

diff --git a/DependencyInjection/ElaoErrorNotifierExtension.php b/DependencyInjection/ElaoErrorNotifierExtension.php
@@ -3,7 +3,6 @@
 namespace Elao\ErrorNotifierBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -14,14 +13,11 @@
  */
 class ElaoErrorNotifierExtension extends Extension
 {
-
     /**
      * load configuration
      *
      * @param array            $configs   configs
      * @param ContainerBuilder $container container
-     *
-     * @return void
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -36,7 +32,8 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('services.xml');
 
             if ($config['mailer'] != 'mailer') {
-                $container->getDefinition('elao.error_notifier.listener')->replaceArgument(0, new Reference($config['mailer']));
+                $definition = $container->getDefinition('elao.error_notifier.listener');
+                $definition->replaceArgument(0, new Reference($config['mailer']));
             }
         }
     }

diff --git a/Listener/Notifier.php b/Listener/Notifier.php
@@ -2,7 +2,7 @@
 
 namespace Elao\ErrorNotifierBundle\Listener;
 
-use \Swift_Mailer;
+use Swift_Mailer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -20,14 +20,13 @@
  */
 class Notifier
 {
-
     /**
-     * @var Swift_Mailer $mailer
+     * @var Swift_Mailer
      */
     private $mailer;
 
     /**
-     * @var EngineInterface $templating
+     * @var EngineInterface
      */
     private $templating;
 
@@ -198,10 +197,10 @@ protected function setErrorHandlers()
     /**
      * @see http://php.net/set_error_handler
      *
-     * @param integer $level
-     * @param string  $message
-     * @param string  $file
-     * @param integer $line
+     * @param int    $level
+     * @param string $message
+     * @param string $file
+     * @param int    $line
      *
      * @throws ErrorException
      */
@@ -220,7 +219,7 @@ public function handlePhpError($level, $message, $file, $line, $errcontext)
             return false;
         }
 
-        if(in_array($message, $this->ignoredPhpErrors)) {
+        if (in_array($message, $this->ignoredPhpErrors)) {
             return false;
         }
 
@@ -257,7 +256,7 @@ public function handlePhpFatalErrorAndWarnings()
         }
 
         if (in_array($lastError['type'], $errors) && !in_array(@$lastError['message'], $this->ignoredPhpErrors)) {
-            $exception = new \ErrorException(sprintf('%s: %s in %s line %d', @$this->getErrorString(@$lastError['type']), @$lastError['message'], @$lastError['file'], @$lastError['line']),  @$lastError['type'], @$lastError['type'], @$lastError['file'], @$lastError['line']);
+            $exception = new \ErrorException(sprintf('%s: %s in %s line %d', @$this->getErrorString(@$lastError['type']), @$lastError['message'], @$lastError['file'], @$lastError['line']), @$lastError['type'], @$lastError['type'], @$lastError['file'], @$lastError['line']);
             $this->createMailAndSend($exception, $this->request, null, $this->command, $this->commandInput);
         }
     }
@@ -317,12 +316,12 @@ public function createMailAndSend($exception, Request $request = null, $context
             'command_input'   => $commandInput
         ));
 
-        if($this->request) {
-            $subject = '[' . $request->headers->get('host') . '] Error ' . $exception->getStatusCode() . ': ' . $exception->getMessage();
-        } elseif($this->command) {
-            $subject = '[' . $this->command->getName() . '] Error ' . $exception->getStatusCode() . ': ' . $exception->getMessage();
+        if ($this->request) {
+            $subject = '['.$request->headers->get('host').'] Error '.$exception->getStatusCode().': '.$exception->getMessage();
+        } elseif ($this->command) {
+            $subject = '['.$this->command->getName().'] Error '.$exception->getStatusCode().': '.$exception->getMessage();
         } else {
-            $subject = 'Error ' . $exception->getStatusCode() . ': ' . $exception->getMessage();
+            $subject = 'Error '.$exception->getStatusCode().': '.$exception->getMessage();
         }
 
         if (function_exists('mb_substr')) {
@@ -373,5 +372,4 @@ protected static function _freeMemory()
     {
         self::$tmpBuffer = '';
     }
-
 }
diff --git a/Twig/DumpyTwigFilter.php b/Twig/DumpyTwigFilter.php
@@ -105,14 +105,14 @@ public function yamlDump($value, $depth = self::MAX_DEPTH)
      * @param  int          $recursionDepth    The depth of recursion (used internally)
      * @return array|string
      */
-    public function sanitize ($value, $maxRecursionDepth = self::MAX_DEPTH, $recursionDepth = 0)
+    public function sanitize($value, $maxRecursionDepth = self::MAX_DEPTH, $recursionDepth = 0)
     {
         if (is_resource($value)) {
             return 'Resource';
         }
 
         if (is_array($value)) {
-            return $this->sanitizeIterateable ($value, $maxRecursionDepth, $recursionDepth);
+            return $this->sanitizeIterateable($value, $maxRecursionDepth, $recursionDepth);
         }
 
         if ($value instanceof InvokerException) {
@@ -148,7 +148,7 @@ public function sanitize ($value, $maxRecursionDepth = self::MAX_DEPTH, $recursi
                 $data = array();
                 $data['class'] = '<span title="' . $class->getName(). '">' . $class->getShortName() . '</span>';
                 if ($class->isIterateable()) {
-                    $data['iterateable'] = $this->sanitizeIterateable ($value, $maxRecursionDepth, $recursionDepth);
+                    $data['iterateable'] = $this->sanitizeIterateable($value, $maxRecursionDepth, $recursionDepth);
                 } else {
                     $data['accessors'] = array();
                     foreach ($class->getMethods() as $method) {
@@ -205,7 +205,7 @@ public function sanitize ($value, $maxRecursionDepth = self::MAX_DEPTH, $recursi
         return $value;
     }
 
-    public function sanitizeIterateable ($value, $maxRecursionDepth = self::MAX_DEPTH, $recursionDepth = 0)
+    public function sanitizeIterateable($value, $maxRecursionDepth = self::MAX_DEPTH, $recursionDepth = 0)
     {
         if ($recursionDepth < $maxRecursionDepth) {
             $r = array ();
@@ -215,15 +215,16 @@ public function sanitizeIterateable ($value, $maxRecursionDepth = self::MAX_DEPT
             foreach ($value as $k => $v) {
                 $r[$k] = $this->sanitize($v, $maxRecursionDepth, $recursionDepth + 1);
                 $count++;
-                if($count >= 20) {
+                if ($count >= 20) {
                     $r[] = sprintf('... and %s more ...', ($arrayCount - $count));
                     break;
                 }
             }
-            
+
             return $r;
         } else {
-            $c = count($value); $t = gettype($value);
+            $c = count($value);
+            $t = gettype($value);
 
             return $c ? "$t of $c" : "empty $t";
         }

diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
 
     "require": {
         "php":                      ">=5.3.2",
-        "symfony/framework-bundle": "~2.3",
-        "symfony/console":          "~2.3",
+        "symfony/framework-bundle": "~2.3|~3.0",
+        "symfony/console":          "~2.3|~3.0",
         "swiftmailer/swiftmailer":  "~5.0"
     },