Add Overridable Parameter Containing Path to Public Directory

- Adds `css_to_inline_email_twig_extension.public_dir` parameter containing path to public directory
  (default remains as `web` just outside kernel root)
- Removes unused `use` statements
- Adds twig as dev dependency

Author: David Cochrum

.gitignore

@@ -1,3 +1,4 @@
+/.idea
 phpunit.xml
 composer.lock
 /vendor

README.md

@@ -69,7 +69,7 @@ $converter->setHTMLByView(
 );
 ```
 
-The preceding function must be used _in vece_ of function ```setHTML()```.
+The preceding function must be used _instead_ of ```setHTML()```.
 
 To use the ```generateStyledHTML``` method just use it like:
 
@@ -121,6 +121,10 @@ Dynamic variable is supported (Use absolute path with variable with asset or dir
 
 Read the docs in the files for further details on the usage of the service.
 
+Configuration
+=============
+The `css_to_inline_email_twig_extension.public_dir` parameter contains the path to the root directory accessible to the web. This path is assumed to be a `web` directory just outside the kernel root directory as recommended in Symfony 2-3 (`%kernel.root_dir%/../web`). With Symfony 4, the recommended path moved to a `public` directory just outside the kernel root directory (`%kernel.root_dir%/../public`). Override the parameter with the correct path for your implementation.
+
 Contributing
 ============
 **ToInlineStyleEmailBundle** is an open source project, under MIT license. Contributions are encouraged.

Resources/config/services.xml

@@ -7,6 +7,7 @@
     <parameters>
         <parameter key="css_to_inline_email_converter.class">RobertoTru\ToInlineStyleEmailBundle\Converter\ToInlineStyleEmailConverter</parameter>
         <parameter key="css_to_inline_email_twig_extension.class">RobertoTru\ToInlineStyleEmailBundle\Twig\InlineCssExtension</parameter>
+        <parameter key="css_to_inline_email_twig_extension.public_dir">%kernel.root_dir%/../web</parameter>
     </parameters>
 
     <services>
@@ -16,7 +17,7 @@
         <service id="css_to_inline_email_twig_extension" class="%css_to_inline_email_twig_extension.class%">
             <argument type="service" id="css_to_inline_email_converter" />
             <argument type="service" id="file_locator" />
-            <argument>%kernel.root_dir%</argument>
+            <argument>%css_to_inline_email_twig_extension.public_dir%</argument>
             <argument>%kernel.debug%</argument>
             <tag name="twig.extension" />
         </service>

Twig/InlineCssExtension.php

@@ -13,7 +13,6 @@
 
 use RobertoTru\ToInlineStyleEmailBundle\Converter\ToInlineStyleEmailConverter;
 use Symfony\Component\Config\FileLocatorInterface;
-use Symfony\Component\Templating\TemplateNameParserInterface;
 
 class InlineCssExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
 {
@@ -24,7 +23,7 @@ class InlineCssExtension extends \Twig_Extension implements \Twig_Extension_Glob
     /**
      * @var string
      */
-    private $kernelRoot;
+    private $publicPath;
     /**
      * @var FileLocatorInterface
      */
@@ -37,12 +36,12 @@ class InlineCssExtension extends \Twig_Extension implements \Twig_Extension_Glob
     public function __construct(
         ToInlineStyleEmailConverter $inlineCss,
         FileLocatorInterface $locator,
-        $kernelRoot,
+        $publicPath,
         $debug = false
     ) {
         $this->inlineCss = $inlineCss;
         $this->locator = $locator;
-        $this->kernelRoot = $kernelRoot;
+        $this->publicPath = $publicPath;
         $this->debug = $debug;
     }
 
@@ -51,7 +50,7 @@ public function __construct(
      */
     public function getTokenParsers()
     {
-        return array(new InlineCssParser($this->locator, $this->kernelRoot . '/../web', $this->debug));
+        return array(new InlineCssParser($this->locator, $this->publicPath, $this->debug));
     }
 
     /**

Twig/InlineCssParser.php

@@ -12,7 +12,6 @@
 namespace RobertoTru\ToInlineStyleEmailBundle\Twig;
 
 use Symfony\Component\Config\FileLocatorInterface;
-use Symfony\Component\Templating\TemplateNameParserInterface;
 use Twig_Node;
 use Twig_Token;
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "gushphp/to-inline-style-email-bundle",
     "type": "symfony-bundle",
-    "description": "A Symfony2 bundle for using the CssToInlineStyles translator by tijsverkoyen",
+    "description": "A Symfony bundle for using the CssToInlineStyles translator by tijsverkoyen",
     "keywords": ["css", "inline", "style", "email", "symfony", "bundle"],
     "homepage": "http://github.com/gushphp/ToInlineStyleEmailBundle",
     "license": "MIT",
@@ -19,7 +19,8 @@
     },
     "require-dev": {
         "symfony/framework-bundle": "*",
-        "phpunit/phpunit": "^4.4"
+        "phpunit/phpunit": "^4.4",
+        "twig/twig": "*"
     },
     "autoload": {
         "psr-4": { "RobertoTru\\ToInlineStyleEmailBundle\\": "" }