Merge pull request #7 from thewilkybarkid/modernise-constraints

Modernise constraints

Author: thewilkybarkid

Tests/AbstractTestCase.php

@@ -23,7 +23,7 @@ class AbstractTestCase extends PHPUnit_Framework_TestCase
     protected function getContainer(array $config = array(), KernelInterface $kernel = null)
     {
         if (null === $kernel) {
-            $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+            $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
             $kernel
                 ->expects($this->any())
                 ->method('getBundles')

Tests/Helper/LinkifyHelperTest.php

@@ -18,7 +18,7 @@ class LinkifyHelperTest extends AbstractTestCase
 {
     public function testConstructor()
     {
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
 
         $helper = new LinkifyHelper($linkify);
 
@@ -28,7 +28,7 @@ public function testConstructor()
 
     public function testCharset()
     {
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
 
         $helper = new LinkifyHelper($linkify);
 
@@ -39,7 +39,7 @@ public function testCharset()
 
     public function testName()
     {
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
 
         $helper = new LinkifyHelper($linkify);
 
@@ -51,7 +51,7 @@ public function testProcess()
         $text = 'test';
         $options = array('key' => 'value');
 
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
         $linkify->expects($this->once())->method('process')->with($text, $options);
 
         $helper = new LinkifyHelper($linkify);

Tests/Twig/Extension/LinkifyTwigExtensionTest.php

@@ -18,8 +18,8 @@ class LinkifyTwigExtensionTest extends AbstractTestCase
 {
     public function testConstructor()
     {
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
-        $helper = $this->getMock('Misd\LinkifyBundle\Helper\LinkifyHelper', array(), array($linkify));
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
+        $helper = $this->getMockBuilder('Misd\LinkifyBundle\Helper\LinkifyHelper')->setConstructorArgs(array($linkify))->getMock();
 
         $extension = new LinkifyTwigExtension($helper);
 
@@ -29,8 +29,8 @@ public function testConstructor()
 
     public function testFilters()
     {
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
-        $helper = $this->getMock('Misd\LinkifyBundle\Helper\LinkifyHelper', array(), array($linkify));
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
+        $helper = $this->getMockBuilder('Misd\LinkifyBundle\Helper\LinkifyHelper')->setConstructorArgs(array($linkify))->getMock();
 
         $extension = new LinkifyTwigExtension($helper);
 
@@ -45,8 +45,11 @@ public function testLinkify()
         $text = 'test';
         $options = array('key' => 'value');
 
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
-        $helper = $this->getMock('Misd\LinkifyBundle\Helper\LinkifyHelper', array('process'), array($linkify));
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
+        $helper = $this->getMockBuilder('Misd\LinkifyBundle\Helper\LinkifyHelper')
+            ->setMethods(array('process'))
+            ->setConstructorArgs(array($linkify))
+            ->getMock();
         $helper->expects($this->once())->method('process')->with($text, $options);
 
         $extension = new LinkifyTwigExtension($helper);
@@ -56,8 +59,8 @@ public function testLinkify()
 
     public function testName()
     {
-        $linkify = $this->getMock('Misd\Linkify\Linkify');
-        $helper = $this->getMock('Misd\LinkifyBundle\Helper\LinkifyHelper', array(), array($linkify));
+        $linkify = $this->getMockBuilder('Misd\Linkify\Linkify')->getMock();
+        $helper = $this->getMockBuilder('Misd\LinkifyBundle\Helper\LinkifyHelper')->setConstructorArgs(array($linkify))->getMock();
 
         $extension = new LinkifyTwigExtension($helper);
 

composer.json

@@ -15,13 +15,13 @@
         "issues": "https://github.com/misd-service-development/linkify-bundle/issues"
     },
     "require": {
-        "php": ">=5.3.3",
-        "symfony/framework-bundle": "~2.1",
-        "misd/linkify": "~1.0"
+        "php": "^5.3.3 || ^7.0",
+        "symfony/framework-bundle": "^2.1",
+        "misd/linkify": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "symfony/twig-bundle": "~2.1"
+        "phpunit/phpunit": "^4.0 || ^5.0",
+        "symfony/twig-bundle": "^2.1"
     },
     "conflict": {
         "phpunit/phpunit-mock-objects": "<2.2"