added experemental support for decoda v4

helios-ag · Nov 13, 2012 · 9062dac · 9062dac
1 parent d914913
commit 9062dac
Show file tree

Hide file tree

Showing 29 changed files with 62 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,16 @@ language: php
 
 php:
   - 5.3
+  - 5.4
+env:
+  - SYMFONY_VERSION=2.0.*
+  - SYMFONY_VERSION=2.1.*
+  - SYMFONY_VERSION=dev-master
 
 before_script:
   - curl -s http://getcomposer.org/installer | php --
   - php composer.phar install --dev
-  - php composer.phar require symfony/framework-bundle:2.0.17
+  - php composer.phar require symfony/framework-bundle:${SYMFONY_VERSION}
 
 script: phpunit --coverage-text
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Decoda/Decoda.php b/Decoda/Decoda.php
@@ -2,7 +2,7 @@
 
 namespace FM\BbcodeBundle\Decoda;
 
-use \Decoda as BaseDecoda;
+use mjohnson\decoda\Decoda as BaseDecoda;
 
 class Decoda extends BaseDecoda
 {
@@ -13,7 +13,7 @@ class Decoda extends BaseDecoda
      */
     public function __construct($string = '', $messages = array())
     {
-        spl_autoload_register(array($this, 'loadFile'));
+
 
         $this->setMessages($messages);
         $this->reset($string, true);

diff --git a/Decoda/DecodaManager.php b/Decoda/DecodaManager.php
@@ -4,6 +4,22 @@
 use FM\BbcodeBundle\Decoda\Decoda;
 use FM\BbcodeBundle\Decoda\DecodaPhpEngine;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use mjohnson\decoda\filters\Filter,
+    mjohnson\decoda\filters\DefaultFilter,
+    mjohnson\decoda\filters\BlockFilter,
+    mjohnson\decoda\filters\CodeFilter,
+    mjohnson\decoda\filters\EmailFilter,
+    mjohnson\decoda\filters\ImageFilter,
+    mjohnson\decoda\filters\ListFilter,
+    mjohnson\decoda\filters\QuoteFilter,
+    mjohnson\decoda\filters\TextFilter,
+    mjohnson\decoda\filters\UrlFilter,
+    mjohnson\decoda\filters\VideoFilter;
+use mjohnson\decoda\hooks\CensorHook,
+    mjohnson\decoda\hooks\ClickableHook,
+    mjohnson\decoda\hooks\CodeHook,
+    mjohnson\decoda\hooks\EmoticonHook,
+    mjohnson\decoda\hooks\Hook;
 
 /**
  * @author Al Ganiev <[email protected]>
@@ -33,7 +49,6 @@ public function __construct(Decoda $value, array $filters = array(), array $hook
         $this->filters = $filters;
         $this->hooks = $hooks;
         $this->whitelist = $whitelist;
-
     }
 
     public static function add_filter($name, $filter){
@@ -49,8 +64,6 @@ public static function add_templatePath( $path ){
         static::$extra_paths[] = $path;
     }
 
-
-
     /**
      * Applies filter specified in parameter
      * @param \FM\BbcodeBundle\Decoda\Decoda $code
@@ -60,43 +73,44 @@ public static function add_templatePath( $path ){
      */
     protected function apply_filter(Decoda $code, $filter)
     {
-        //default, block, code, email, image, list, quote, text, url, video ]
+        //default, block, code, email, image, list, quote, text, url, video
         if(isset(static::$extra_filters[$filter])){
-            $extra_filter = static::$extra_filters[$filter] instanceof \DecodaFilter ? static::$extra_filters[$filter] : new static::$extra_filters[$filter]();
+            $extra_filter = static::$extra_filters[$filter] instanceof Filter ? static::$extra_filters[$filter] : new static::$extra_filters[$filter]();
             $code->addFilter($extra_filter);
             return $code;
         }
 
         switch ($filter) {
             case 'block':
-                $code->addFilter(new \BlockFilter());
+                $code->addFilter(new BlockFilter());
                 break;
             case 'code':
-                $code->addFilter(new \CodeFilter());
+                $code->addFilter(new CodeFilter());
                 break;
             case 'email':
-                $code->addFilter(new \EmailFilter());
+                $code->addFilter(new EmailFilter());
                 break;
             case 'image':
-                $code->addFilter(new \ImageFilter());
+                $code->addFilter(new ImageFilter());
                 break;
             case 'list':
-                $code->addFilter(new \ListFilter());
+                $code->addFilter(new ListFilter());
                 break;
             case 'quote':
-                $code->addFilter(new \QuoteFilter());
+                $code->addFilter(new QuoteFilter());
                 break;
             case 'text':
-                $code->addFilter(new \TextFilter());
+                $code->addFilter(new TextFilter());
                 break;
             case 'url':
-                $code->addFilter(new \UrlFilter());
+                $code->addFilter(new UrlFilter());
                 break;
             case 'video':
-                $code->addFilter(new \VideoFilter());
+                $code->addFilter(new VideoFilter());
                 break;
             case 'default':
-                $code->addFilter(new \DefaultFilter());
+                $code->addFilter(new DefaultFilter());
+                break;
             default:
                 return $code;
         }
@@ -112,20 +126,20 @@ protected function apply_hook(Decoda $code, $hook)
     {
 
         if(isset(static::$extra_hooks[$hook])){
-            $extra_hook = static::$extra_hooks[$hook] instanceof \DecodaHook ? static::$extra_hooks[$hook] : new static::$extra_hooks[$hook]();
+            $extra_hook = static::$extra_hooks[$hook] instanceof Hook ? static::$extra_hooks[$hook] : new static::$extra_hooks[$hook]();
             $code->addFilter($extra_hook);
             return $code;
         }
 
         switch ($hook) {
             case 'censor':
-                $code->addHook(new \CensorHook());
+                $code->addHook(new CensorHook());
                 break;
             case 'clickable':
-                $code->addHook(new \ClickableHook());
+                $code->addHook(new ClickableHook());
                 break;
             case 'emoticon':
-                $code->addHook(new \EmoticonHook());
+                $code->addHook(new EmoticonHook());
                 break;
         }
         return $code;
@@ -153,7 +167,7 @@ public function getResult()
             $decodaPhpEngine->setpath($extraPath);
         }
 
-        $this->value->setTemplateEngine($decodaPhpEngine);
+        $this->value->setEngine($decodaPhpEngine);
 
 
         foreach($this->filters as $filter)

diff --git a/Decoda/DecodaPhpEngine.php b/Decoda/DecodaPhpEngine.php
@@ -1,6 +1,8 @@
 <?php
 
 namespace FM\BbcodeBundle\Decoda;
+use mjohnson\decoda\engines\PhpEngine;
+use mjohnson\decoda\filters\Filter;
 use Exception;
 /**
  * DecodaPhpEngine
@@ -13,7 +15,7 @@
  * @license     http://opensource.org/licenses/mit-license.php - Licensed under The MIT License
  * @link        http://milesj.me/code/php/decoda
  */
-class DecodaPhpEngine implements \DecodaTemplateEngineInterface
+class DecodaPhpEngine extends PhpEngine
 {
     /**
      * Current path.
@@ -113,10 +115,10 @@ public function render(array $tag, $content)
      * Sets the current filter.
      *
      * @access public
-     * @param  DecodaFilter                  $filter
+     * @param \mjohnson\decoda\filters\Filter $filter
      * @return DecodaTemplateEngineInterface
      */
-    public function setFilter(\DecodaFilter $filter)
+    public function setFilter(Filter $filter)
     {
         $this->_filter = $filter;
 

diff --git a/Decoda/Hook/EmoticonHook.php b/Decoda/Hook/EmoticonHook.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace FM\BbcodeBundle\Decoda\Hook;
+
+use mjohnson\decoda\hooks\EmoticonHook;
+
+class EmoticonHook2 extends EmoticonHook
+{
+
+    public function setConfig(array $config) {
+        $this->_config = $config;
+    }
+
+}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
diff --git a/DependencyInjection/FMBbcodeExtension.php b/DependencyInjection/FMBbcodeExtension.php
diff --git a/FMBbcodeBundle.php b/FMBbcodeBundle.php
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/Resources/config/bbcode.xml b/Resources/config/bbcode.xml
diff --git a/Resources/config/messages.json b/Resources/config/messages.json
diff --git a/Templating/BbcodeExtension.php b/Templating/BbcodeExtension.php
diff --git a/Templating/Helper/BbcodeHelper.php b/Templating/Helper/BbcodeHelper.php
diff --git a/Tests/AppKernel.php b/Tests/AppKernel.php
diff --git a/Tests/DependencyInjection/FMBbcodeExtensionTest.php b/Tests/DependencyInjection/FMBbcodeExtensionTest.php
diff --git a/Tests/FunctionalTestBundle/FunctionalTestBundle.php b/Tests/FunctionalTestBundle/FunctionalTestBundle.php
diff --git a/Tests/FunctionalTestBundle/Resources/views/filters/default.html.twig b/Tests/FunctionalTestBundle/Resources/views/filters/default.html.twig
diff --git a/Tests/FunctionalTestBundle/Resources/views/filters/image.html.twig b/Tests/FunctionalTestBundle/Resources/views/filters/image.html.twig
diff --git a/Tests/FunctionalTestBundle/Resources/views/filters/url.html.twig b/Tests/FunctionalTestBundle/Resources/views/filters/url.html.twig
diff --git a/Tests/Templating/BbcodeExtensionTest.php b/Tests/Templating/BbcodeExtensionTest.php
diff --git a/Tests/Templating/Helper/BbcodeHelperTest.php b/Tests/Templating/Helper/BbcodeHelperTest.php
diff --git a/Tests/TwigBasedTestCase.php b/Tests/TwigBasedTestCase.php
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
diff --git a/Tests/config/config.yml b/Tests/config/config.yml
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "mjohnson/decoda": "3.*"
+        "mjohnson/decoda": "4.0.2"
     },
     "autoload": {
         "psr-0": { "FM\\BbcodeBundle": "" }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist