improve and move to PSR4

cordoval · cordoval · commit 4ea090a2ca8b · 2015-01-04T01:22:24.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-/phpunit.xml
-*~
+phpunit.xml
 composer.lock
-/vendor/
+/vendor
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,3 @@ language: php
 php:
   - 5.3
   - 5.4
-
-before_script:
-    - curl -s http://getcomposer.org/installer | php
-    - php composer.phar install --dev
diff --git a/Converter/MissingParamException.php b/Converter/MissingParamException.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of ToInlineStyleEmailBundle.
  *
@@ -15,6 +16,7 @@
  *
  * @author Roberto Trunfio <roberto@trunfio.it>
  */
-class MissingParamException extends \Exception {
+class MissingParamException extends \Exception
+{
 
 }
diff --git a/Converter/MissingTemplatingEngineException.php b/Converter/MissingTemplatingEngineException.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of ToInlineStyleEmailBundle.
  *
@@ -15,6 +16,7 @@
  *
  * @author Roberto Trunfio <roberto@trunfio.it>
  */
-class MissingTemplatingEngineException extends \Exception {
+class MissingTemplatingEngineException extends \Exception
+{
 
 }
diff --git a/Converter/ToInlineStyleEmailConverter.php b/Converter/ToInlineStyleEmailConverter.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of ToInlineStyleEmailBundle.
  *
@@ -25,8 +26,8 @@
  *
  * @author Roberto Trunfio <roberto@trunfio.it>
  */
-class ToInlineStyleEmailConverter {
-
+class ToInlineStyleEmailConverter
+{
     /**
      * Container is used to get template engine instead of direct injection.
      * Direct injection is not used to avoid circular reference exception when rendering using twig tag
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
diff --git a/DependencyInjection/RobertoTruToInlineStyleEmailExtension.php b/DependencyInjection/RobertoTruToInlineStyleEmailExtension.php
@@ -7,21 +7,13 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 
-/**
- * This is the class that loads and manages your bundle configuration
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
- */
 class RobertoTruToInlineStyleEmailExtension extends Extension
 {
     /**
      * {@inheritDoc}
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
     }
diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
diff --git a/Tests/ToInlineStyleEmailBundleTest.php b/Tests/ToInlineStyleEmailBundleTest.php
@@ -4,13 +4,10 @@
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ToInlineStyleEmailBundleTest extends WebTestCase {
-    public function testIndex() {
+class ToInlineStyleEmailBundleTest extends WebTestCase
+{
+    public function testIndex()
+    {
 
-        //$client = static::createClient();
-
-        //$crawler = $client->request('GET', '/hello/Fabien');
-
-        //$this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0);
     }
 }
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -5,4 +5,4 @@
     throw new RuntimeException('Install dependencies to run test suite. "php composer.phar install --dev"');
 }
 
-require_once $file;
+require_once $file;
diff --git a/Twig/InlineCssExtension.php b/Twig/InlineCssExtension.php
@@ -1,16 +1,9 @@
 <?php
-/**
- * User: avasilenko
- * Date: 5/2/13
- * Time: 17:56
- */
+
 namespace RobertoTru\ToInlineStyleEmailBundle\Twig;
 
 use RobertoTru\ToInlineStyleEmailBundle\Converter\ToInlineStyleEmailConverter;
-use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator;
-use Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser;
 use Symfony\Component\Config\FileLocatorInterface;
-use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\Templating\TemplateNameParserInterface;
 
 class InlineCssExtension extends \Twig_Extension 
@@ -24,20 +17,25 @@ class InlineCssExtension extends \Twig_Extension
      */
     private $kernelRoot;
     /**
-     * @var \Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator
+     * @var FileLocatorInterface
      */
     private $locator;
     /**
-     * @var \Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser
+     * @var TemplateNameParserInterface
      */
     private $name_parser;
     /**
      * @var bool
      */
     private $debug;
 
-    public function __construct(ToInlineStyleEmailConverter $inlineCss, FileLocatorInterface $locator, TemplateNameParser $name_parser, $kernelRoot, $debug = false)
-    {
+    public function __construct(
+        ToInlineStyleEmailConverter $inlineCss,
+        FileLocatorInterface $locator,
+        TemplateNameParserInterface $name_parser,
+        $kernelRoot,
+        $debug = false
+    ) {
         $this->inlineCss = $inlineCss;
         $this->locator = $locator;
         $this->name_parser = $name_parser;
@@ -50,15 +48,15 @@ public function __construct(ToInlineStyleEmailConverter $inlineCss, FileLocatorI
      */
     public function getTokenParsers()
     {
-        return  array( new InlineCssParser($this->locator, $this->name_parser, $this->kernelRoot . '/../web', $this->debug) );
+        return  array(new InlineCssParser($this->locator, $this->name_parser, $this->kernelRoot . '/../web', $this->debug));
     }
 
     /**
      * {@inheritDoc}
      */
     public function getGlobals()
     {
-        return array (
+        return array(
             'inlinecss' => $this->inlineCss,
         );
     }
diff --git a/Twig/InlineCssNode.php b/Twig/InlineCssNode.php
@@ -1,9 +1,5 @@
 <?php
-/**
- * User: avasilenko
- * Date: 5/2/13
- * Time: 17:30
- */
+
 namespace RobertoTru\ToInlineStyleEmailBundle\Twig;
 
 use Twig_Compiler;
@@ -28,6 +24,7 @@ public function compile(Twig_Compiler $compiler)
         $compiler->addDebugInfo($this)
             ->write("ob_start();\n")
             ->subcompile($this->getNode('body'))
-            ->write(sprintf('echo $context["inlinecss"]->inlineCSS(ob_get_clean(), %s);' . "\n", $css));
+            ->write(sprintf('echo $context["inlinecss"]->inlineCSS(ob_get_clean(), %s);' . "\n", $css))
+        ;
     }
 }
diff --git a/Twig/InlineCssParser.php b/Twig/InlineCssParser.php
@@ -1,9 +1,5 @@
 <?php
-/**
- * User: avasilenko
- * Date: 5/2/13
- * Time: 17:18
- */
+
 namespace RobertoTru\ToInlineStyleEmailBundle\Twig;
 
 use Symfony\Component\Config\FileLocatorInterface;
@@ -62,8 +58,7 @@ public function parse(Twig_Token $token)
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
         $body = $this->parser->subparse(array($this, 'decideEnd'), true);
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        
-        
+
         return new InlineCssNode($body, $this->resolvePath($path), $lineNo, $this->debug); 
     }
 
@@ -92,7 +87,7 @@ private function resolvePath($path)
         try {
             return $this->locator->locate($this->templateNameParser->parse($path));
         } catch (\InvalidArgumentException $e) {
-            //happens when path is not bundle relative
+            // happens when path is not bundle relative
             return $this->webRoot.'/'.$path;
         }
     }
diff --git a/composer.json b/composer.json
@@ -1,7 +1,5 @@
 {
     "name": "robertotru/to-inline-style-email-bundle",
-    "version": "1.0.0-dev",
-    "time": "2013-01-16",    
     "type": "symfony-bundle",
     "description": "A Symfony2 bundle for using the CssToInlineStyles translator by tijsverkoyen",
     "keywords": ["css", "inline", "style", "email", "symfony", "bundle"],
@@ -19,17 +17,12 @@
         "php": ">=5.3.3",
         "tijsverkoyen/css-to-inline-styles": "~1.2"
     },
-    "require-dev": {
-        "symfony/framework-bundle": ">=2.1,<2.2-dev"
-    },
     "autoload": {
-        "psr-0": { "RobertoTru\\ToInlineStyleEmailBundle": "" }
+        "psr-4": { "RobertoTru\\ToInlineStyleEmailBundle": "" }
     },
-    "target-dir": "RobertoTru/ToInlineStyleEmailBundle",
     "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.0-dev"
-            }
-    },    
-    "minimum-stability": "dev"
+        "branch-alias": {
+            "dev-master": "1.1-dev"
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/*`
`3`	`4`	`* This file is part of ToInlineStyleEmailBundle.`
`4`	`5`	`*`
`@@ -15,6 +16,7 @@`
`15`	`16`	`*`
`16`	`17`	`* @author Roberto Trunfio <[email protected]>`
`17`	`18`	`*/`
`18`		`-class MissingParamException extends \Exception {`
	`19`	`+class MissingParamException extends \Exception`
	`20`	`+{`
`19`	`21`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@`
`5`	`5`	`throw new RuntimeException('Install dependencies to run test suite. "php composer.phar install --dev"');`
`6`	`6`	`}`
`7`	`7`
`8`		`-require_once $file;`
	`8`	`+require_once $file;`