Merge pull request zendframework#14

Author: Maks3w

composer.json

@@ -26,7 +26,7 @@
         "zendframework/zend-version": ">=2.0.0"
     },
     "require-dev": {
-        "zendframework/zend-i18n": ">=2.0.0"
+        "phpunit/PHPUnit": "3.7.*"
     },
     "extra": {
         "branch-alias": {

tests/ZendGData/Analytics/AccountFeedTest.php

@@ -28,7 +28,7 @@ class AccountFeedTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->accountFeed = new AccountFeed(
-            file_get_contents(dirname(__FILE__) . '/_files/TestAccountFeed.xml')
+            file_get_contents(__DIR__ . '/_files/TestAccountFeed.xml')
         );
     }
 

tests/ZendGData/Analytics/DataFeedTest.php

@@ -35,7 +35,7 @@ class DataFeedTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->dataFeed = new DataFeed(
-            file_get_contents(dirname(__FILE__) . '/_files/TestDataFeed.xml')
+            file_get_contents(__DIR__ . '/_files/TestDataFeed.xml')
         );
     }
 

tests/ZendGData/App/AuthorTest.php

@@ -25,7 +25,7 @@ class AuthorTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->authorText = file_get_contents(
-                'ZendGData/App/_files/AuthorElementSample1.xml',
+                __DIR__ . '/_files/AuthorElementSample1.xml',
                 true);
         $this->author = new Extension\Author();
     }

tests/ZendGData/App/BaseTest.php

@@ -21,7 +21,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->fileName = 'ZendGData/App/_files/FeedSample1.xml';
+        $this->fileName = __DIR__ . '/_files/FeedSample1.xml';
         $this->base = new \ZendGDataTest\App\TestAsset\MockBase();
     }
 

tests/ZendGData/App/CategoryTest.php

@@ -25,7 +25,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->categoryText = file_get_contents(
-                'ZendGData/App/_files/CategoryElementSample1.xml',
+                __DIR__ . '/_files/CategoryElementSample1.xml',
                 true);
         $this->category = new Extension\Category();
     }

tests/ZendGData/App/ContentTest.php

@@ -25,10 +25,10 @@ class ContentTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->contentText = file_get_contents(
-                'ZendGData/App/_files/ContentElementSample1.xml',
+                __DIR__ . '/_files/ContentElementSample1.xml',
                 true);
         $this->contentText2 = file_get_contents(
-                'ZendGData/App/_files/ContentElementSample2.xml',
+                __DIR__ . '/_files/ContentElementSample2.xml',
                 true);
         $this->content = new Extension\Content();
     }

tests/ZendGData/App/ControlTest.php

@@ -25,7 +25,7 @@ class ControlTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->controlText = file_get_contents(
-                'ZendGData/App/_files/ControlElementSample1.xml',
+                __DIR__ . '/_files/ControlElementSample1.xml',
                 true);
         $this->control = new Extension\Control();
     }

tests/ZendGData/App/EntryTest.php

@@ -41,10 +41,10 @@ class EntryTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->entryText = file_get_contents(
-                'ZendGData/App/_files/EntrySample1.xml',
+                __DIR__ . '/_files/EntrySample1.xml',
                 true);
         $this->httpEntrySample = file_get_contents(
-                'ZendGData/App/_files/EntrySampleHttp1.txt',
+                __DIR__ . '/_files/EntrySampleHttp1.txt',
                 true);
         $this->entry = new App\Entry();
 

tests/ZendGData/App/FeedTest.php

@@ -29,7 +29,7 @@ class FeedTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->feedText = file_get_contents(
-                'ZendGData/App/_files/FeedSample1.xml',
+                __DIR__ . '/_files/FeedSample1.xml',
                 true);
         $this->feed = new App\Feed();
     }