From 0ef45dbed15cc7a46fb32ba33aee08a35827ef31 Mon Sep 17 00:00:00 2001
From: Peter Rehm <peter.rehm@renvest.de>
Date: Wed, 10 Jun 2015 19:56:07 -0400
Subject: [PATCH 1/2] Extend the deprecated CoreAssetHelper to maintain BC

---
 .../Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
index 8379c6830eb19..338cb801ab5a0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
@@ -13,14 +13,14 @@
 
 use Symfony\Component\Asset\Packages;
 use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;
-use Symfony\Component\Templating\Helper\Helper;
+use Symfony\Component\Templating\Helper\CoreAssetsHelper;
 
 /**
  * AssetsHelper helps manage asset URLs.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class AssetsHelper extends Helper
+class AssetsHelper extends CoreAssetsHelper
 {
     private $packages;
 

From 2658c5eb4fe5e91ae033867902441470c79d185e Mon Sep 17 00:00:00 2001
From: Peter Rehm <peter.rehm@renvest.de>
Date: Thu, 11 Jun 2015 11:28:21 -0400
Subject: [PATCH 2/2] Reverted code change and updated upgrade information

---
 UPGRADE-2.7.md                                | 51 +++++++++++++++++++
 UPGRADE-3.0.md                                |  2 +-
 .../Templating/Helper/AssetsHelper.php        |  4 +-
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/UPGRADE-2.7.md b/UPGRADE-2.7.md
index bf27241beb6db..f780bb93e83b9 100644
--- a/UPGRADE-2.7.md
+++ b/UPGRADE-2.7.md
@@ -592,3 +592,54 @@ TwigBundle
        background: {{ brand_color|raw }};
    }
    ```
+
+FrameworkBundle
+---------------
+
+ * The `templating.helper.assets` was refactored and returns now an object of the type
+   `Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper` instead of
+   `Symfony\Component\Templating\Helper\CoreAssetsHelper`. You can update your class definition
+   or use the `assets.package` service instead. Using the `assets.package` service is the recommended 
+   way. The `templating.helper.assets` service will be removed in Symfony 3.0.
+
+   Before:
+
+   ```php
+   use Symfony\Component\Templating\Helper\CoreAssetsHelper;
+
+   class DemoService
+   {
+       private $assetsHelper;
+
+       public function __construct(CoreAssetsHelper $assetsHelper)
+       {
+           $this->assetsHelper = $assetsHelper;
+       }
+
+       public function testMethod()
+       {
+           return $this->assetsHelper->getUrl('thumbnail.png', null, $this->assetsHelper->getVersion());
+       }
+   }
+   ```
+
+   After:
+
+   ```php
+   use Symfony\Component\Asset\Packages;
+
+   class DemoService
+   {
+       private $assetPackages;
+
+       public function __construct(Packages $assetPackages)
+       {
+           $this->assetPackages = $assetPackages;
+       }
+
+       public function testMethod()
+       {
+           return $this->assetPackages->getUrl('thumbnail.png').$this->assetPackages->getVersion();
+       }
+   }
+   ```
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index cf103242a8fa7..1c2abe7308a7c 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -349,7 +349,7 @@ UPGRADE FROM 2.x to 3.0
  * The `request` service was removed. You must inject the `request_stack`
    service instead.
 
- * The `templating.helper.assets` was moved to `templating_php.xml`. You can
+ * The `templating.helper.assets` was removed in Symfony 3.0. You should
    use the `assets.package` service instead.
 
    Before:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
index 338cb801ab5a0..8379c6830eb19 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
@@ -13,14 +13,14 @@
 
 use Symfony\Component\Asset\Packages;
 use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;
-use Symfony\Component\Templating\Helper\CoreAssetsHelper;
+use Symfony\Component\Templating\Helper\Helper;
 
 /**
  * AssetsHelper helps manage asset URLs.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class AssetsHelper extends CoreAssetsHelper
+class AssetsHelper extends Helper
 {
     private $packages;