[BC] Remove deprecated code for Symfony 2.7

Jérôme Poskin · Jérôme Poskin · commit d5a9664738dd · 2015-09-26T00:51:33.000+02:00
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": "" }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function testGetName()`
`36`	`36`	`public function testGetFilters()`
`37`	`37`	`{`
`38`	`38`	`$filters = $this->extension->getFilters();`
`39`		`- $this->assertInstanceOf('\Twig_Filter_Method', $filters['time_ago']);`
	`39`	`+ $this->assertInstanceOf('\Twig_SimpleFilter', $filters['time_ago']);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testGetName()`
`43`	`43`	`public function testGetFilters()`
`44`	`44`	`{`
`45`	`45`	`$filters = $this->extension->getFilters();`
`46`		`- $this->assertInstanceOf('\Twig_Filter_Method', $filters['safe_truncate']);`
	`46`	`+ $this->assertInstanceOf('\Twig_SimpleFilter', $filters['safe_truncate']);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`@@ -100,7 +100,7 @@ private function assertSafeTruncate()`
`100`	`100`	`{`
`101`	`101`	`$separator = '...';`
`102`	`102`
`103`		`- $env = $this->getMock('\Twig_Environment');`
	`103`	`+ $env = $this->getMock('\Twig_Environment', [], [], '', false);`
`104`	`104`	`$env->expects($this->any())->method('getCharset')->will($this->returnValue('utf8'));`
`105`	`105`
`106`	`106`	`// Simple text`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class PasswordStrengthValidatorTest extends \PHPUnit_Framework_TestCase`
`12`	`12`
`13`	`13`	`protected function setUp()`
`14`	`14`	`{`
`15`		`- $this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);`
	`15`	`+ $this->context = $this->getMock('Symfony\Component\Validator\Context\ExecutionContext', array(), array(), '', false);`
`16`	`16`	`$this->validator = new PasswordStrengthValidator();`
`17`	`17`	`$this->validator->initialize($this->context);`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`	`class DateExtension extends \Twig_Extension`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`		`- * @var Translator`
	`10`	`+ * @var TranslatorInterface`
`11`	`11`	`*/`
`12`	`12`	`private $translator;`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Date extension constructor`
`16`	`16`	`*`
`17`		`- * @param Translator $translator`
	`17`	`+ * @param TranslatorInterface $translator`
`18`	`18`	`*/`
`19`	`19`	`public function __construct(TranslatorInterface $translator)`
`20`	`20`	`{`
`@@ -29,7 +29,7 @@ public function __construct(TranslatorInterface $translator)`
`29`	`29`	`public function getFilters()`
`30`	`30`	`{`
`31`	`31`	`return array(`
`32`		`- 'time_ago' => new \Twig_Filter_Method($this, 'timeAgo'),`
	`32`	`+ 'time_ago' => new \Twig_SimpleFilter($this, 'timeAgo'),`
`33`	`33`	`);`
`34`	`34`	`}`
`35`	`35`
`@@ -81,7 +81,7 @@ public function timeAgo($datetime, $locale = null)`
`81`	`81`	`/**`
`82`	`82`	`* Helper used to get a date interval between a date and now`
`83`	`83`	`*`
`84`		`- * @param string\|DateTime $datetime`
	`84`	`+ * @param string\|\DateTime $datetime`
`85`	`85`	`*`
`86`	`86`	`* @return \DateInterval`
`87`	`87`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function initRuntime(\Twig_Environment $environment)`
`37`	`37`	`public function getFunctions()`
`38`	`38`	`{`
`39`	`39`	`return array(`
`40`		`- 'faceboook_sdk_code' => new \Twig_Function_Method($this, 'getFacebookSdkCode', array('is_safe' => array('html'))),`
	`40`	`+ 'faceboook_sdk_code' => new \Twig_SimpleFunction($this, 'getFacebookSdkCode', array('is_safe' => array('html'))),`
`41`	`41`	`);`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ public function initRuntime(\Twig_Environment $environment)`
`66`	`66`	`public function getFunctions()`
`67`	`67`	`{`
`68`	`68`	`return array(`
`69`		`- 'analytics_tracking_code' => new \Twig_Function_Method($this, 'getAnalyticsTrackingCode', array('is_safe' => array('html'))),`
`70`		`- 'analytics_tracking_commerce' => new \Twig_Function_Method($this, 'getAnalyticsCommerce', array('is_safe' => array('html'))),`
`71`		`- 'tags_manager_code' => new \Twig_Function_Method($this, 'getTagsManagerCode', array('is_safe' => array('html'))),`
	`69`	`+ 'analytics_tracking_code' => new \Twig_SimpleFunction($this, 'getAnalyticsTrackingCode', array('is_safe' => array('html'))),`
	`70`	`+ 'analytics_tracking_commerce' => new \Twig_SimpleFunction($this, 'getAnalyticsCommerce', array('is_safe' => array('html'))),`
	`71`	`+ 'tags_manager_code' => new \Twig_SimpleFunction($this, 'getTagsManagerCode', array('is_safe' => array('html'))),`
`72`	`72`	`);`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function initRuntime(\Twig_Environment $environment)`
`52`	`52`	`public function getFunctions()`
`53`	`53`	`{`
`54`	`54`	`return array(`
`55`		`- 'paginator_widget' => new \Twig_Function_Method($this, 'renderPaginatorWidget', array('is_safe' => array('html'))),`
	`55`	`+ 'paginator_widget' => new \Twig_SimpleFunction($this, 'renderPaginatorWidget', array('is_safe' => array('html'))),`
`56`	`56`	`);`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ public function getName()`
`44`	`44`	`public function getFilters()`
`45`	`45`	`{`
`46`	`46`	`return array(`
`47`		`- 'camelize' => new \Twig_Filter_Method($this, 'camelize', array('is_safe' => array('html'))),`
`48`		`- 'safe_truncate' => new \Twig_Filter_Method($this, 'safeTruncate', array('needs_environment' => true, 'is_safe' => array('html'))),`
	`47`	`+ 'camelize' => new \Twig_SimpleFilter($this, 'camelize', array('is_safe' => array('html'))),`
	`48`	`+ 'safe_truncate' => new \Twig_SimpleFilter($this, 'safeTruncate', array('needs_environment' => true, 'is_safe' => array('html'))),`
`49`	`49`	`);`
`50`	`50`	`}`
`51`	`51`