From dc9be197219af3eb6e8082f89e62b6ae65bd419b Mon Sep 17 00:00:00 2001
From: Ahti Ahde <ahti.ahde@loudrevolution.net>
Date: Mon, 8 Jul 2013 17:01:56 +0300
Subject: [PATCH 1/4] Fixed the tests and dependencies

---
 Tests/Twig/Extension/FilelibExtensionTest.php | 9 ++++++---
 composer.json                                 | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Tests/Twig/Extension/FilelibExtensionTest.php b/Tests/Twig/Extension/FilelibExtensionTest.php
index b6cb220..304d304 100644
--- a/Tests/Twig/Extension/FilelibExtensionTest.php
+++ b/Tests/Twig/Extension/FilelibExtensionTest.php
@@ -26,9 +26,12 @@ class FilelibExtensionTest extends PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->fileOperator = $this->getMock('Xi\Filelib\File\FileOperator');
+        $this->fileOperator = $this->getMockBuilder('Xi\Filelib\File\DefaultFileOperator')
+                                ->setMethods(array('find'))->getMock();
 
-        $filelib = $this->getMock('Xi\Filelib\FileLibrary');
+        $filelib = $this->getMockBuilder('Xi\Filelib\FileLibrary')
+                    ->disableOriginalConstructor()
+                    ->setMethods(array('find', 'findById', 'getFileOperator'))->getMock();
         $filelib->expects($this->any())
                 ->method('getFileOperator')
                 ->will($this->returnValue($this->fileOperator));
@@ -76,7 +79,7 @@ public function isFileCompletedGetsFileWhenGivenAFileId()
         $this->file->expects($this->once())
                    ->method('getStatus')
                    ->will($this->returnValue(File::STATUS_COMPLETED));
-
+        
         $this->fileOperator->expects($this->once())
                            ->method('find')
                            ->with(123)
diff --git a/composer.json b/composer.json
index a1ce498..1d5ee34 100644
--- a/composer.json
+++ b/composer.json
@@ -25,10 +25,10 @@
     },
 
     "require-dev": {
-        "symfony/http-kernel": ">=2.1.0",
-        "symfony/dependency-injection": ">=2.1.0",
-        "symfony/config": ">=2.1.0",
-        "symfony/yaml": ">=2.1.0",
+        "symfony/http-kernel": "2.2.x",
+        "symfony/dependency-injection": "2.2.x",
+        "symfony/config": "2.2.x",
+        "symfony/yaml": "2.2.x",
         "twig/twig": ">=1.9.1"
     },
 

From 69768751152e4eba598c789b61c3cbd51154a791 Mon Sep 17 00:00:00 2001
From: Ahti Ahde <ahti.ahde@loudrevolution.net>
Date: Mon, 8 Jul 2013 17:29:15 +0300
Subject: [PATCH 2/4] Fixed for less strict dependencies

---
 Tests/Twig/Extension/FilelibExtensionTest.php |  1 +
 composer.json                                 | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Tests/Twig/Extension/FilelibExtensionTest.php b/Tests/Twig/Extension/FilelibExtensionTest.php
index 304d304..b99f3d8 100644
--- a/Tests/Twig/Extension/FilelibExtensionTest.php
+++ b/Tests/Twig/Extension/FilelibExtensionTest.php
@@ -27,6 +27,7 @@ class FilelibExtensionTest extends PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->fileOperator = $this->getMockBuilder('Xi\Filelib\File\DefaultFileOperator')
+                                ->disableOriginalConstructor()
                                 ->setMethods(array('find'))->getMock();
 
         $filelib = $this->getMockBuilder('Xi\Filelib\FileLibrary')
diff --git a/composer.json b/composer.json
index 1d5ee34..948b984 100644
--- a/composer.json
+++ b/composer.json
@@ -21,14 +21,14 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.3",
-        "xi/filelib": ">=0.7.0"
+        "xi/filelib": "dev-symfony2.2-support"
     },
 
     "require-dev": {
-        "symfony/http-kernel": "2.2.x",
-        "symfony/dependency-injection": "2.2.x",
-        "symfony/config": "2.2.x",
-        "symfony/yaml": "2.2.x",
+        "symfony/http-kernel": ">=2.1.0,<2.3-dev",
+        "symfony/dependency-injection": ">=2.1.0,<2.3-dev",
+        "symfony/config": ">=2.1.0,<2.3-dev",
+        "symfony/yaml": ">=2.1.0,<2.3-dev",
         "twig/twig": ">=1.9.1"
     },
 

From 5942ba9aaf195d362407fe3712c6eb09b7c19436 Mon Sep 17 00:00:00 2001
From: Ahti Ahde <ahti.ahde@loudrevolution.net>
Date: Mon, 8 Jul 2013 17:42:51 +0300
Subject: [PATCH 3/4] Fixed the deps

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 948b984..61338c3 100644
--- a/composer.json
+++ b/composer.json
@@ -20,11 +20,11 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.3.3",
-        "xi/filelib": "dev-symfony2.2-support"
+        "php": ">=5.3.3"
     },
 
     "require-dev": {
+        "xi/filelib": "dev-symfony2.2-support",
         "symfony/http-kernel": ">=2.1.0,<2.3-dev",
         "symfony/dependency-injection": ">=2.1.0,<2.3-dev",
         "symfony/config": ">=2.1.0,<2.3-dev",

From 40d37887378ef467893245f8d35df57696e63708 Mon Sep 17 00:00:00 2001
From: Ahti Ahde <ahti.ahde@loudrevolution.net>
Date: Thu, 11 Jul 2013 15:18:59 +0300
Subject: [PATCH 4/4] Fixed for Symfony2.3 support, tests pass

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 61338c3..67ab820 100644
--- a/composer.json
+++ b/composer.json
@@ -24,11 +24,11 @@
     },
 
     "require-dev": {
-        "xi/filelib": "dev-symfony2.2-support",
-        "symfony/http-kernel": ">=2.1.0,<2.3-dev",
-        "symfony/dependency-injection": ">=2.1.0,<2.3-dev",
-        "symfony/config": ">=2.1.0,<2.3-dev",
-        "symfony/yaml": ">=2.1.0,<2.3-dev",
+        "xi/filelib": "dev-master",
+        "symfony/http-kernel": ">=2.1.0,<2.4-dev",
+        "symfony/dependency-injection": ">=2.1.0,<2.4-dev",
+        "symfony/config": ">=2.1.0,<2.4-dev",
+        "symfony/yaml": ">=2.1.0,<2.4-dev",
         "twig/twig": ">=1.9.1"
     },