Prepare for v2.0 release

stfalcon · Mar 29, 2016 · 998761a · 998761a
1 parent 405a7f6
commit 998761a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Twig/Extension/StfalconTinymceExtension.php b/Twig/Extension/StfalconTinymceExtension.php
@@ -94,7 +94,7 @@ public function tinymceInit($options = array())
         unset($config['asset_package_name']);
 
         /** @var $assets \Symfony\Component\Templating\Helper\CoreAssetsHelper */
-        $assets = $this->getService('templating.helper.assets');
+        $assets = $this->getService('assets.packages');
 
         // Get path to tinymce script for the jQuery version of the editor
         if ($config['tinymce_jquery']) {
@@ -204,7 +204,7 @@ public function getName()
     protected function getAssetsUrl($inputUrl)
     {
         /** @var $assets \Symfony\Component\Templating\Helper\CoreAssetsHelper */
-        $assets = $this->getService('templating.helper.assets');
+        $assets = $this->getService('assets.packages');
 
         $url = preg_replace('/^asset\[(.+)\]$/i', '$1', $inputUrl);
 

diff --git a/composer.json b/composer.json
@@ -33,5 +33,10 @@
             "Stfalcon\\Bundle\\TinymceBundle": ""
         }
     },
-    "target-dir" : "Stfalcon/Bundle/TinymceBundle"
+    "target-dir" : "Stfalcon/Bundle/TinymceBundle",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        }
+    }
 }