[BC] Remove deprecated code for Symfony 2.7

snowcap · Sep 25, 2015 · d5a9664 · d5a9664
1 parent f2824cf
commit d5a9664
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 33 deletions.
diff --git a/Tests/Twig/Extension/DateExtensionTest.php b/Tests/Twig/Extension/DateExtensionTest.php
@@ -36,7 +36,7 @@ public function testGetName()
     public function testGetFilters()
     {
         $filters = $this->extension->getFilters();
-        $this->assertInstanceOf('\Twig_Filter_Method', $filters['time_ago']);
+        $this->assertInstanceOf('\Twig_SimpleFilter', $filters['time_ago']);
     }
 
     /**

diff --git a/Tests/Twig/Extension/TextExtensionTest.php b/Tests/Twig/Extension/TextExtensionTest.php
@@ -43,7 +43,7 @@ public function testGetName()
     public function testGetFilters()
     {
         $filters = $this->extension->getFilters();
-        $this->assertInstanceOf('\Twig_Filter_Method', $filters['safe_truncate']);
+        $this->assertInstanceOf('\Twig_SimpleFilter', $filters['safe_truncate']);
     }
 
     /**
@@ -100,7 +100,7 @@ private function assertSafeTruncate()
     {
         $separator = '...';
 
-        $env = $this->getMock('\Twig_Environment');
+        $env = $this->getMock('\Twig_Environment', [], [], '', false);
         $env->expects($this->any())->method('getCharset')->will($this->returnValue('utf8'));
 
         // Simple text

diff --git a/Tests/Validator/PasswordStrengthValidatorTest.php b/Tests/Validator/PasswordStrengthValidatorTest.php
@@ -12,7 +12,7 @@ class PasswordStrengthValidatorTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);
+        $this->context = $this->getMock('Symfony\Component\Validator\Context\ExecutionContext', array(), array(), '', false);
         $this->validator = new PasswordStrengthValidator();
         $this->validator->initialize($this->context);
     }

diff --git a/Twig/Extension/DateExtension.php b/Twig/Extension/DateExtension.php
@@ -7,14 +7,14 @@
 class DateExtension extends \Twig_Extension
 {
     /**
-     * @var Translator
+     * @var TranslatorInterface
      */
     private $translator;
 
     /**
      * Date extension constructor
      *
-     * @param Translator $translator
+     * @param TranslatorInterface $translator
      */
     public function __construct(TranslatorInterface $translator)
     {
@@ -29,7 +29,7 @@ public function __construct(TranslatorInterface $translator)
     public function getFilters()
     {
         return array(
-            'time_ago' => new \Twig_Filter_Method($this, 'timeAgo'),
+            'time_ago' => new \Twig_SimpleFilter($this, 'timeAgo'),
         );
     }
 
@@ -81,7 +81,7 @@ public function timeAgo($datetime, $locale = null)
     /**
      * Helper used to get a date interval between a date and now
      *
-     * @param string|DateTime $datetime
+     * @param string|\DateTime $datetime
      *
      * @return \DateInterval
      */

diff --git a/Twig/Extension/FacebookExtension.php b/Twig/Extension/FacebookExtension.php
@@ -37,7 +37,7 @@ public function initRuntime(\Twig_Environment $environment)
     public function getFunctions()
     {
         return array(
-            'faceboook_sdk_code' => new \Twig_Function_Method($this, 'getFacebookSdkCode', array('is_safe' => array('html'))),
+            'faceboook_sdk_code' => new \Twig_SimpleFunction($this, 'getFacebookSdkCode', array('is_safe' => array('html'))),
         );
     }
 

diff --git a/Twig/Extension/GoogleExtension.php b/Twig/Extension/GoogleExtension.php
@@ -66,9 +66,9 @@ public function initRuntime(\Twig_Environment $environment)
     public function getFunctions()
     {
         return array(
-            'analytics_tracking_code'     => new \Twig_Function_Method($this, 'getAnalyticsTrackingCode', array('is_safe' => array('html'))),
-            'analytics_tracking_commerce' => new \Twig_Function_Method($this, 'getAnalyticsCommerce', array('is_safe' => array('html'))),
-            'tags_manager_code' => new \Twig_Function_Method($this, 'getTagsManagerCode', array('is_safe' => array('html'))),
+            'analytics_tracking_code'     => new \Twig_SimpleFunction($this, 'getAnalyticsTrackingCode', array('is_safe' => array('html'))),
+            'analytics_tracking_commerce' => new \Twig_SimpleFunction($this, 'getAnalyticsCommerce', array('is_safe' => array('html'))),
+            'tags_manager_code' => new \Twig_SimpleFunction($this, 'getTagsManagerCode', array('is_safe' => array('html'))),
         );
     }
 

diff --git a/Twig/Extension/NavigationExtension.php b/Twig/Extension/NavigationExtension.php
@@ -29,13 +29,13 @@ public function __construct(NavigationRegistry $registry)
     public function getFunctions()
     {
         return array(
-            'set_active_paths' => new \Twig_Function_Method($this, 'setActivePaths'),
-            'add_active_path' => new \Twig_Function_Method($this, 'addActivePath'),
+            'set_active_paths' => new \Twig_SimpleFunction($this, 'setActivePaths'),
+            'add_active_path' => new \Twig_SimpleFunction($this, 'addActivePath'),
             'get_active_paths' => new \Twig_Function_Method($this, 'getActivePaths'),
-            'is_active_path' => new \Twig_Function_Method($this, 'isActivePath'),
-            'append_breadcrumb' => new \Twig_Function_Method($this, 'appendBreadcrumb'),
-            'prepend_breadcrumb' => new \Twig_Function_Method($this, 'prependBreadcrumb'),
-            'get_breadcrumbs' => new \Twig_Function_Method($this, 'getBreadCrumbs'),
+            'is_active_path' => new \Twig_SimpleFunction($this, 'isActivePath'),
+            'append_breadcrumb' => new \Twig_SimpleFunction($this, 'appendBreadcrumb'),
+            'prepend_breadcrumb' => new \Twig_SimpleFunction($this, 'prependBreadcrumb'),
+            'get_breadcrumbs' => new \Twig_SimpleFunction($this, 'getBreadCrumbs'),
         );
     }
 

diff --git a/Twig/Extension/PaginatorExtension.php b/Twig/Extension/PaginatorExtension.php
@@ -52,7 +52,7 @@ public function initRuntime(\Twig_Environment $environment)
     public function getFunctions()
     {
         return array(
-            'paginator_widget' => new \Twig_Function_Method($this, 'renderPaginatorWidget', array('is_safe' => array('html'))),
+            'paginator_widget' => new \Twig_SimpleFunction($this, 'renderPaginatorWidget', array('is_safe' => array('html'))),
         );
     }
 

diff --git a/Twig/Extension/SiteExtension.php b/Twig/Extension/SiteExtension.php
@@ -25,13 +25,13 @@ class SiteExtension extends \Twig_Extension
     public function getFunctions()
     {
         return array(
-            'prepend_page_title' => new \Twig_Function_Method($this, 'prependPageTitle'),
-            'append_page_title' => new \Twig_Function_Method($this, 'appendPageTitle'),
-            'page_title' => new \Twig_Function_Method($this, 'getPageTitle'),
-            'meta_description' => new \Twig_Function_Method($this, 'getMetaDescription'),
-            'set_meta_description' => new \Twig_Function_Method($this, 'setMetaDescription'),
-            'meta_keywords' => new \Twig_Function_Method($this, 'getMetaKeywords'),
-            'add_meta_keywords' => new \Twig_Function_Method($this, 'addMetaKeywords'),
+            'prepend_page_title' => new \Twig_SimpleFunction($this, 'prependPageTitle'),
+            'append_page_title' => new \Twig_SimpleFunction($this, 'appendPageTitle'),
+            'page_title' => new \Twig_SimpleFunction($this, 'getPageTitle'),
+            'meta_description' => new \Twig_SimpleFunction($this, 'getMetaDescription'),
+            'set_meta_description' => new \Twig_SimpleFunction($this, 'setMetaDescription'),
+            'meta_keywords' => new \Twig_SimpleFunction($this, 'getMetaKeywords'),
+            'add_meta_keywords' => new \Twig_SimpleFunction($this, 'addMetaKeywords'),
         );
     }
 

diff --git a/Twig/Extension/TextExtension.php b/Twig/Extension/TextExtension.php
@@ -44,8 +44,8 @@ public function getName()
     public function getFilters()
     {
         return array(
-            'camelize' => new \Twig_Filter_Method($this, 'camelize', array('is_safe' => array('html'))),
-            'safe_truncate' => new \Twig_Filter_Method($this, 'safeTruncate', array('needs_environment' => true, 'is_safe' => array('html'))),
+            'camelize' => new \Twig_SimpleFilter($this, 'camelize', array('is_safe' => array('html'))),
+            'safe_truncate' => new \Twig_SimpleFilter($this, 'safeTruncate', array('needs_environment' => true, 'is_safe' => array('html'))),
         );
     }
 

diff --git a/composer.json b/composer.json
@@ -23,17 +23,19 @@
             "homepage": "http://www.snowcap.be"
         }
     ],
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.3.3",
         "symfony/framework-bundle": ">=2.7"
     },
     "require-dev": {
         "symfony/symfony": ">=2.7",
-        "fzaninotto/faker": "1.1.*@dev",
-        "doctrine/orm": ">=2.2.3",
-        "doctrine/doctrine-bundle": "1.2.*",
-        "doctrine/data-fixtures": "1.0.*@dev"
+        "fzaninotto/faker": "^1.5",
+        "doctrine/orm": "^2.5",
+        "doctrine/doctrine-bundle": "^1.5",
+        "doctrine/data-fixtures": "^1.1",
+        "phpunit/phpunit": "^4.8",
+        "symfony/phpunit-bridge": "^2.7"
 },
     "autoload": {
         "psr-0": { "Snowcap\\CoreBundle": "" }