diff --git a/lib/unitTest/ACLTest.php b/lib/unitTest/ACLTest.php
index 4f0c802b59..612b51ad0b 100644
--- a/lib/unitTest/ACLTest.php
+++ b/lib/unitTest/ACLTest.php
@@ -1,7 +1,7 @@
 <?php
 
 //require_once 'PHPUnit/Framework.php';
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for ACL.
diff --git a/lib/unitTest/Alchemy/Phrasea/Application/OverviewTest.php b/lib/unitTest/Alchemy/Phrasea/Application/OverviewTest.php
index 68423324ef..190f1bfa68 100644
--- a/lib/unitTest/Alchemy/Phrasea/Application/OverviewTest.php
+++ b/lib/unitTest/Alchemy/Phrasea/Application/OverviewTest.php
@@ -47,7 +47,7 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../../Alchemy/Phrasea/Application/Overview.php';
+    return require __DIR__ . '/../../../../Alchemy/Phrasea/Application/Overview.php';
   }
 
 //$deliver_content = function(session $session, record_adapter $record, $subdef, $watermark, $stamp, $app)
diff --git a/lib/unitTest/Alchemy/Phrasea/Controller/Prod/FeedTest.php b/lib/unitTest/Alchemy/Phrasea/Controller/Prod/FeedTest.php
index 43cfae1327..12facef8a1 100644
--- a/lib/unitTest/Alchemy/Phrasea/Controller/Prod/FeedTest.php
+++ b/lib/unitTest/Alchemy/Phrasea/Controller/Prod/FeedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 require_once __DIR__ . '/../../../../../Alchemy/Phrasea/Controller/Prod/Feed.php';
 
diff --git a/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php b/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
index 5bbd3c708a..6878ba397c 100644
--- a/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
+++ b/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Auth_Abstract.
diff --git a/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php b/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
index e273da922d..d62b978f81 100644
--- a/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
+++ b/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Auth_Flickr.
diff --git a/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php b/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
index eab0fa9c1a..3f4fe86a60 100644
--- a/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
+++ b/lib/unitTest/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Auth_OAuth2.
diff --git a/lib/unitTest/Bridge/Api/Bridge_Api_AbstractCollectionTest.php b/lib/unitTest/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
index 4a7611d747..d5ac544767 100644
--- a/lib/unitTest/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
+++ b/lib/unitTest/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../Bridge_datas.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_AbstractCollection.
diff --git a/lib/unitTest/Bridge/Api/Bridge_Api_AbstractTest.php b/lib/unitTest/Bridge/Api/Bridge_Api_AbstractTest.php
index 53487e9709..c84d2ab0eb 100644
--- a/lib/unitTest/Bridge/Api/Bridge_Api_AbstractTest.php
+++ b/lib/unitTest/Bridge/Api/Bridge_Api_AbstractTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../Bridge_datas.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Abstract.
diff --git a/lib/unitTest/Bridge/Api/Bridge_Api_ContainerCollectionTest.php b/lib/unitTest/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
index 4f0ba32794..99ad8de6f6 100644
--- a/lib/unitTest/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
+++ b/lib/unitTest/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../Bridge_datas.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_ContainerCollection.
diff --git a/lib/unitTest/Bridge/Api/Bridge_Api_DailymotionTest.php b/lib/unitTest/Bridge/Api/Bridge_Api_DailymotionTest.php
index c003562a01..1f88f9b041 100644
--- a/lib/unitTest/Bridge/Api/Bridge_Api_DailymotionTest.php
+++ b/lib/unitTest/Bridge/Api/Bridge_Api_DailymotionTest.php
@@ -1,7 +1,7 @@
 <?php
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../Bridge_datas.inc';
-require_once dirname(__FILE__) . '/../../../classes/Bridge/Api/Dailymotion.class.php';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../Bridge_datas.inc';
+require_once __DIR__ . '/../../../classes/Bridge/Api/Dailymotion.class.php';
 
 /**
  * Test class for Bridge_Api_Dailymotion.
diff --git a/lib/unitTest/Bridge/Api/Bridge_Api_ElementCollectionTest.php b/lib/unitTest/Bridge/Api/Bridge_Api_ElementCollectionTest.php
index 3c0814348e..a62c1769ca 100644
--- a/lib/unitTest/Bridge/Api/Bridge_Api_ElementCollectionTest.php
+++ b/lib/unitTest/Bridge/Api/Bridge_Api_ElementCollectionTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../Bridge_datas.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_ElementCollection.
diff --git a/lib/unitTest/Bridge/Api/Bridge_Api_FlickrTest.php b/lib/unitTest/Bridge/Api/Bridge_Api_FlickrTest.php
index 897ec1968b..f1f4b091bd 100644
--- a/lib/unitTest/Bridge/Api/Bridge_Api_FlickrTest.php
+++ b/lib/unitTest/Bridge/Api/Bridge_Api_FlickrTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../Bridge_datas.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Flickr.
diff --git a/lib/unitTest/Bridge/Api/Bridge_Api_YoutubeTest.php b/lib/unitTest/Bridge/Api/Bridge_Api_YoutubeTest.php
index 361d7929e3..aea9e2f95d 100644
--- a/lib/unitTest/Bridge/Api/Bridge_Api_YoutubeTest.php
+++ b/lib/unitTest/Bridge/Api/Bridge_Api_YoutubeTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../Bridge_datas.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Youtube.
diff --git a/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php b/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
index 04c358c92b..f8b5a63e4e 100644
--- a/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
+++ b/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
@@ -1,7 +1,7 @@
 <?php
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
-require_once dirname(__FILE__) . '/../../../../classes/Bridge/Api/Dailymotion/Container.class.php';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../../classes/Bridge/Api/Dailymotion/Container.class.php';
 
 /**
  * Test class for Bridge_Api_Dailymotion_Container.
diff --git a/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php b/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
index 1b9fa8bc2d..267cbd799a 100644
--- a/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
+++ b/lib/unitTest/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
-require_once dirname(__FILE__) . '/../../../../classes/Bridge/Api/Dailymotion/Element.class.php';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../../classes/Bridge/Api/Dailymotion/Element.class.php';
 
 /**
  * Test class for Bridge_Api_Dailymotion_Element.
diff --git a/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php b/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
index f8514e91b0..4c4103e036 100644
--- a/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
+++ b/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Flickr_Container.
diff --git a/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php b/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
index f2c0e8e4d7..b76799419a 100644
--- a/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
+++ b/lib/unitTest/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api_Flickr_Element.
diff --git a/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php b/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
index edb3a79d85..c94f34f1d7 100644
--- a/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
+++ b/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
 
-$new_include_path = dirname(__FILE__) . '/../../../../vendor/gdata/' . PATH_SEPARATOR . get_include_path();
+$new_include_path = __DIR__ . '/../../../../vendor/gdata/' . PATH_SEPARATOR . get_include_path();
 set_include_path($new_include_path);
 
 
diff --git a/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php b/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
index 6efeac0914..9c4a846016 100644
--- a/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
+++ b/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../Bridge_datas.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../Bridge_datas.inc';
 
-$new_include_path = dirname(__FILE__) . '/../../../../../vendor/alchemy/gdata/' . PATH_SEPARATOR . get_include_path();
+$new_include_path = __DIR__ . '/../../../../../vendor/alchemy/gdata/' . PATH_SEPARATOR . get_include_path();
 set_include_path($new_include_path);
 
 
diff --git a/lib/unitTest/Bridge/ApplicationTest.php b/lib/unitTest/Bridge/ApplicationTest.php
index d1a55377f2..c253e3efe7 100644
--- a/lib/unitTest/Bridge/ApplicationTest.php
+++ b/lib/unitTest/Bridge/ApplicationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../bootstrap.php';
-require_once dirname(__FILE__) . '/Bridge_datas.inc';
+require_once __DIR__ . '/../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/Bridge_datas.inc';
 
 use Silex\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/lib/unitTest/Bridge/Bridge_AccountSettingsTest.php b/lib/unitTest/Bridge/Bridge_AccountSettingsTest.php
index db0d92fa48..77c1c5c74f 100644
--- a/lib/unitTest/Bridge/Bridge_AccountSettingsTest.php
+++ b/lib/unitTest/Bridge/Bridge_AccountSettingsTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/Bridge_datas.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Account.
diff --git a/lib/unitTest/Bridge/Bridge_AccountTest.php b/lib/unitTest/Bridge/Bridge_AccountTest.php
index c509703c10..12f6c3648a 100644
--- a/lib/unitTest/Bridge/Bridge_AccountTest.php
+++ b/lib/unitTest/Bridge/Bridge_AccountTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/Bridge_datas.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Account.
diff --git a/lib/unitTest/Bridge/Bridge_ApiTest.php b/lib/unitTest/Bridge/Bridge_ApiTest.php
index edf84c7554..0117b4488d 100644
--- a/lib/unitTest/Bridge/Bridge_ApiTest.php
+++ b/lib/unitTest/Bridge/Bridge_ApiTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/Bridge_datas.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Api.
diff --git a/lib/unitTest/Bridge/Bridge_ElementTest.php b/lib/unitTest/Bridge/Bridge_ElementTest.php
index 7ea5161a66..1d6bb916ca 100644
--- a/lib/unitTest/Bridge/Bridge_ElementTest.php
+++ b/lib/unitTest/Bridge/Bridge_ElementTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/Bridge_datas.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/Bridge_datas.inc';
 
 /**
  * Test class for Bridge_Element.
diff --git a/lib/unitTest/Bridge/Bridge_datas.inc b/lib/unitTest/Bridge/Bridge_datas.inc
index 0915c86ece..6cdb6a1f50 100644
--- a/lib/unitTest/Bridge/Bridge_datas.inc
+++ b/lib/unitTest/Bridge/Bridge_datas.inc
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../bootstrap.php';
+require_once __DIR__ . '/../../bootstrap.php';
 
 /*
  * This file is part of Phraseanet
diff --git a/lib/unitTest/Doctrine/Repositories/Basket.php b/lib/unitTest/Doctrine/Repositories/Basket.php
new file mode 100644
index 0000000000..e202b9ac98
--- /dev/null
+++ b/lib/unitTest/Doctrine/Repositories/Basket.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2010 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * 
+ * @package
+ * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
+ * @link        www.phraseanet.com
+ */
\ No newline at end of file
diff --git a/lib/unitTest/Feed/Entry/Feed_Entry_AdapterTest.php b/lib/unitTest/Feed/Entry/Feed_Entry_AdapterTest.php
index 151a1e400a..13398ad2a4 100644
--- a/lib/unitTest/Feed/Entry/Feed_Entry_AdapterTest.php
+++ b/lib/unitTest/Feed/Entry/Feed_Entry_AdapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for Feed_Entry_Adapter.
diff --git a/lib/unitTest/Feed/Entry/Feed_Entry_CollectionTest.php b/lib/unitTest/Feed/Entry/Feed_Entry_CollectionTest.php
index 26dd086a73..d73d3520d6 100644
--- a/lib/unitTest/Feed/Entry/Feed_Entry_CollectionTest.php
+++ b/lib/unitTest/Feed/Entry/Feed_Entry_CollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for Feed_Entry_Collection.
diff --git a/lib/unitTest/Feed/Entry/Feed_Entry_ItemTest.php b/lib/unitTest/Feed/Entry/Feed_Entry_ItemTest.php
index dcae8f1626..053903a9ea 100644
--- a/lib/unitTest/Feed/Entry/Feed_Entry_ItemTest.php
+++ b/lib/unitTest/Feed/Entry/Feed_Entry_ItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for Feed_Entry_Item.
diff --git a/lib/unitTest/Feed/Feed_AdapterTest.php b/lib/unitTest/Feed/Feed_AdapterTest.php
index 026c6ca40b..8f6fb140f8 100644
--- a/lib/unitTest/Feed/Feed_AdapterTest.php
+++ b/lib/unitTest/Feed/Feed_AdapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for Feed_Adapter.
@@ -40,11 +40,11 @@ class Feed_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
   public function testSet_icon()
   {
     $this->assertEquals('/skins/icons/rss32.gif', self::$object->get_icon_url());
-    $file = new system_file(dirname(__FILE__) . '/../testfiles/p4logo.jpg');
+    $file = new system_file(__DIR__ . '/../testfiles/p4logo.jpg');
     self::$object->set_icon($file);
     try
     {
-      $file = new system_file(dirname(__FILE__) . '/../testfiles/iphone_pic.jpg');
+      $file = new system_file(__DIR__ . '/../testfiles/iphone_pic.jpg');
       self::$object->set_icon($file);
       $this->fail('Should fail');
     }
diff --git a/lib/unitTest/Feed/Feed_AggregateTest.php b/lib/unitTest/Feed/Feed_AggregateTest.php
index dcac32d0da..d1a5ada5ab 100644
--- a/lib/unitTest/Feed/Feed_AggregateTest.php
+++ b/lib/unitTest/Feed/Feed_AggregateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for Feed_Aggregate.
diff --git a/lib/unitTest/Feed/Feed_CollectionTest.php b/lib/unitTest/Feed/Feed_CollectionTest.php
index 896bb1409e..f4e8c8bbca 100644
--- a/lib/unitTest/Feed/Feed_CollectionTest.php
+++ b/lib/unitTest/Feed/Feed_CollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for Feed_Collection.
diff --git a/lib/unitTest/Feed/Feed_LinkTest.php b/lib/unitTest/Feed/Feed_LinkTest.php
index 123d8db2d1..aec7d164ae 100644
--- a/lib/unitTest/Feed/Feed_LinkTest.php
+++ b/lib/unitTest/Feed/Feed_LinkTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Feed_Link.
diff --git a/lib/unitTest/Feed/Publisher/Feed_Publisher_AdapterTest.php b/lib/unitTest/Feed/Publisher/Feed_Publisher_AdapterTest.php
index 377b0e8242..d7fc15d21f 100644
--- a/lib/unitTest/Feed/Publisher/Feed_Publisher_AdapterTest.php
+++ b/lib/unitTest/Feed/Publisher/Feed_Publisher_AdapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for Feed_Publisher_Adapter.
diff --git a/lib/unitTest/Feed/XML/Feed_XML_AtomTest.php b/lib/unitTest/Feed/XML/Feed_XML_AtomTest.php
index 7f570bb9de..b5e3f8c1e1 100644
--- a/lib/unitTest/Feed/XML/Feed_XML_AtomTest.php
+++ b/lib/unitTest/Feed/XML/Feed_XML_AtomTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Feed_XML_Atom.
diff --git a/lib/unitTest/Feed/XML/Feed_XML_RSSTest.php b/lib/unitTest/Feed/XML/Feed_XML_RSSTest.php
index 0e0ba6ada2..a57be50dea 100644
--- a/lib/unitTest/Feed/XML/Feed_XML_RSSTest.php
+++ b/lib/unitTest/Feed/XML/Feed_XML_RSSTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Feed_XML_RSS.
diff --git a/lib/unitTest/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php b/lib/unitTest/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
index 691f5daa02..359df0b135 100644
--- a/lib/unitTest/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
+++ b/lib/unitTest/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Feed_XML_RSS_Image.
diff --git a/lib/unitTest/Feed/rssfeedsTest.php b/lib/unitTest/Feed/rssfeedsTest.php
index 479c034b0e..a7c64136e2 100644
--- a/lib/unitTest/Feed/rssfeedsTest.php
+++ b/lib/unitTest/Feed/rssfeedsTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetWebTestCaseAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetWebTestCaseAbstract.class.inc';
 use Symfony\Component\HttpFoundation\Response;
 
 class Feed_rssfeedsTest extends PhraseanetWebTestCaseAbstract
@@ -86,14 +86,14 @@ class Feed_rssfeedsTest extends PhraseanetWebTestCaseAbstract
 
     self::$feed_1_private = Feed_Adapter::create($appbox, self::$user, self::$feed_1_private_title, self::$feed_1_private_subtitle);
     self::$feed_1_private->set_public(false);
-    self::$feed_1_private->set_icon(new system_file(dirname(__FILE__) . '/../testfiles/logocoll.gif'));
+    self::$feed_1_private->set_icon(new system_file(__DIR__ . '/../testfiles/logocoll.gif'));
 
     self::$feed_2_private = Feed_Adapter::create($appbox, self::$user, self::$feed_2_private_title, self::$feed_2_private_subtitle);
     self::$feed_2_private->set_public(false);
 
     self::$feed_3_public = Feed_Adapter::create($appbox, self::$user, self::$feed_3_public_title, self::$feed_3_public_subtitle);
     self::$feed_3_public->set_public(true);
-    self::$feed_3_public->set_icon(new system_file(dirname(__FILE__) . '/../testfiles/logocoll.gif'));
+    self::$feed_3_public->set_icon(new system_file(__DIR__ . '/../testfiles/logocoll.gif'));
 
     self::$feed_4_public = Feed_Adapter::create($appbox, self::$user, self::$feed_4_public_title, self::$feed_4_public_subtitle);
     self::$feed_4_public->set_public(true);
@@ -165,7 +165,7 @@ class Feed_rssfeedsTest extends PhraseanetWebTestCaseAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../lib/Alchemy/Phrasea/Application/Root.php';
+    return require __DIR__ . '/../../../lib/Alchemy/Phrasea/Application/Root.php';
   }
 
 //$app->get('/feeds/aggregated/{format}/', function($format) use ($app, $appbox, $display_feed)
diff --git a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
index 6c43afb2d0..24465dd90b 100644
--- a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
+++ b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
@@ -921,7 +921,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     {
       self::$story_1 = \record_adapter::create(
                       self::$collection
-                      , new system_file(dirname(__FILE__) . '/testfiles/test001.CR2')
+                      , new system_file(__DIR__ . '/testfiles/test001.CR2')
                       , false
                       , true
       );
@@ -1093,139 +1093,139 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
       if ((static::$need_records === true || static::$need_records >= 1) && !self::$record_1 instanceof record_adapter)
       {
         echo "generate record 1\n";
-        self::$record_sf_1 = new system_file(dirname(__FILE__) . '/testfiles/test001.CR2');
+        self::$record_sf_1 = new system_file(__DIR__ . '/testfiles/test001.CR2');
         self::$record_1 = record_adapter::create(self::$collection, self::$record_sf_1);
       }
       if ((static::$need_records === true || static::$need_records >= 2) && !self::$record_2 instanceof record_adapter)
       {
         echo "generate record 2\n";
-        self::$record_sf_2 = new system_file(dirname(__FILE__) . '/testfiles/test002.CR2');
+        self::$record_sf_2 = new system_file(__DIR__ . '/testfiles/test002.CR2');
         self::$record_2 = record_adapter::create(self::$collection, self::$record_sf_2);
       }
       if ((static::$need_records === true || static::$need_records >= 3) && !self::$record_3 instanceof record_adapter)
       {
         echo "generate record 3\n";
-        self::$record_sf_3 = new system_file(dirname(__FILE__) . '/testfiles/test003.CR2');
+        self::$record_sf_3 = new system_file(__DIR__ . '/testfiles/test003.CR2');
         self::$record_3 = record_adapter::create(self::$collection, self::$record_sf_3);
       }
       if ((static::$need_records === true || static::$need_records >= 4) && !self::$record_4 instanceof record_adapter)
       {
         echo "generate record 4\n";
-        self::$record_sf_4 = new system_file(dirname(__FILE__) . '/testfiles/test004.CR2');
+        self::$record_sf_4 = new system_file(__DIR__ . '/testfiles/test004.CR2');
         self::$record_4 = record_adapter::create(self::$collection, self::$record_sf_4);
       }
       if ((static::$need_records === true || static::$need_records >= 5) && !self::$record_5 instanceof record_adapter)
       {
         echo "generate record 5\n";
-        self::$record_sf_5 = new system_file(dirname(__FILE__) . '/testfiles/test005.CR2');
+        self::$record_sf_5 = new system_file(__DIR__ . '/testfiles/test005.CR2');
         self::$record_5 = record_adapter::create(self::$collection, self::$record_sf_5);
       }
       if ((static::$need_records === true || static::$need_records >= 6) && !self::$record_6 instanceof record_adapter)
       {
         echo "generate record 6\n";
-        self::$record_sf_6 = new system_file(dirname(__FILE__) . '/testfiles/test006.wav');
+        self::$record_sf_6 = new system_file(__DIR__ . '/testfiles/test006.wav');
         self::$record_6 = record_adapter::create(self::$collection, self::$record_sf_6);
       }
       if ((static::$need_records === true || static::$need_records >= 7) && !self::$record_7 instanceof record_adapter)
       {
         echo "generate record 7\n";
-        self::$record_sf_7 = new system_file(dirname(__FILE__) . '/testfiles/test007.ppt');
+        self::$record_sf_7 = new system_file(__DIR__ . '/testfiles/test007.ppt');
         self::$record_7 = record_adapter::create(self::$collection, self::$record_sf_7);
       }
       if ((static::$need_records === true || static::$need_records >= 8) && !self::$record_8 instanceof record_adapter)
       {
         echo "generate record 8\n";
-        self::$record_sf_8 = new system_file(dirname(__FILE__) . '/testfiles/test008.ai');
+        self::$record_sf_8 = new system_file(__DIR__ . '/testfiles/test008.ai');
         self::$record_8 = record_adapter::create(self::$collection, self::$record_sf_8);
       }
       if ((static::$need_records === true || static::$need_records >= 9) && !self::$record_9 instanceof record_adapter)
       {
         echo "generate record 9\n";
-        self::$record_sf_9 = new system_file(dirname(__FILE__) . '/testfiles/test009.TIFF');
+        self::$record_sf_9 = new system_file(__DIR__ . '/testfiles/test009.TIFF');
         self::$record_9 = record_adapter::create(self::$collection, self::$record_sf_9);
       }
       if ((static::$need_records === true || static::$need_records >= 10) && !self::$record_10 instanceof record_adapter)
       {
-        self::$record_sf_10 = new system_file(dirname(__FILE__) . '/testfiles/test010.fla');
+        self::$record_sf_10 = new system_file(__DIR__ . '/testfiles/test010.fla');
         echo "generate record 10\n";
         self::$record_10 = record_adapter::create(self::$collection, self::$record_sf_10);
       }
       if ((static::$need_records === true || static::$need_records >= 11) && !self::$record_11 instanceof record_adapter)
       {
-        self::$record_sf_11 = new system_file(dirname(__FILE__) . '/testfiles/test011.swf');
+        self::$record_sf_11 = new system_file(__DIR__ . '/testfiles/test011.swf');
         echo "generate record 11\n";
         self::$record_11 = record_adapter::create(self::$collection, self::$record_sf_11);
       }
       if ((static::$need_records === true || static::$need_records >= 12) && !self::$record_12 instanceof record_adapter)
       {
-        self::$record_sf_12 = new system_file(dirname(__FILE__) . '/testfiles/test012.wav');
+        self::$record_sf_12 = new system_file(__DIR__ . '/testfiles/test012.wav');
         echo "generate record 12\n";
         self::$record_12 = record_adapter::create(self::$collection, self::$record_sf_12);
       }
       if ((static::$need_records === true || static::$need_records >= 13) && !self::$record_13 instanceof record_adapter)
       {
-        self::$record_sf_13 = new system_file(dirname(__FILE__) . '/testfiles/test013.ai');
+        self::$record_sf_13 = new system_file(__DIR__ . '/testfiles/test013.ai');
         echo "generate record 13\n";
         self::$record_13 = record_adapter::create(self::$collection, self::$record_sf_13);
       }
       if ((static::$need_records === true || static::$need_records >= 14) && !self::$record_14 instanceof record_adapter)
       {
         echo "generate record 14\n";
-        self::$record_sf_14 = new system_file(dirname(__FILE__) . '/testfiles/test014.swf');
+        self::$record_sf_14 = new system_file(__DIR__ . '/testfiles/test014.swf');
         self::$record_14 = record_adapter::create(self::$collection, self::$record_sf_14);
       }
       if ((static::$need_records === true || static::$need_records >= 15) && !self::$record_15 instanceof record_adapter)
       {
         echo "generate record 15\n";
-        self::$record_sf_15 = new system_file(dirname(__FILE__) . '/testfiles/test015.eps');
+        self::$record_sf_15 = new system_file(__DIR__ . '/testfiles/test015.eps');
         self::$record_15 = record_adapter::create(self::$collection, self::$record_sf_15);
       }
       if ((static::$need_records === true || static::$need_records >= 16) && !self::$record_16 instanceof record_adapter)
       {
         echo "generate record 16\n";
-        self::$record_sf_16 = new system_file(dirname(__FILE__) . '/testfiles/test016.ai');
+        self::$record_sf_16 = new system_file(__DIR__ . '/testfiles/test016.ai');
         self::$record_16 = record_adapter::create(self::$collection, self::$record_sf_16);
       }
       if ((static::$need_records === true || static::$need_records >= 17) && !self::$record_17 instanceof record_adapter)
       {
         echo "generate record 17\n";
-        self::$record_sf_17 = new system_file(dirname(__FILE__) . '/testfiles/test017.wav');
+        self::$record_sf_17 = new system_file(__DIR__ . '/testfiles/test017.wav');
         self::$record_17 = record_adapter::create(self::$collection, self::$record_sf_17);
       }
       if ((static::$need_records === true || static::$need_records >= 18) && !self::$record_18 instanceof record_adapter)
       {
         echo "generate record 18\n";
-        self::$record_sf_18 = new system_file(dirname(__FILE__) . '/testfiles/test018.TIFF');
+        self::$record_sf_18 = new system_file(__DIR__ . '/testfiles/test018.TIFF');
         self::$record_18 = record_adapter::create(self::$collection, self::$record_sf_18);
       }
       if ((static::$need_records === true || static::$need_records >= 19) && !self::$record_19 instanceof record_adapter)
       {
         echo "generate record 19\n";
-        self::$record_sf_19 = new system_file(dirname(__FILE__) . '/testfiles/test019.mp3');
+        self::$record_sf_19 = new system_file(__DIR__ . '/testfiles/test019.mp3');
         self::$record_19 = record_adapter::create(self::$collection, self::$record_sf_19);
       }
       if ((static::$need_records === true || static::$need_records >= 20) && !self::$record_20 instanceof record_adapter)
       {
         echo "generate record 20\n";
-        self::$record_sf_20 = new system_file(dirname(__FILE__) . '/testfiles/test020.mp3');
+        self::$record_sf_20 = new system_file(__DIR__ . '/testfiles/test020.mp3');
         self::$record_20 = record_adapter::create(self::$collection, self::$record_sf_20);
       }
       if ((static::$need_records === true || static::$need_records >= 21) && !self::$record_21 instanceof record_adapter)
       {
         echo "generate record 21\n";
-        self::$record_sf_21 = new system_file(dirname(__FILE__) . '/testfiles/test021.fla');
+        self::$record_sf_21 = new system_file(__DIR__ . '/testfiles/test021.fla');
         self::$record_21 = record_adapter::create(self::$collection, self::$record_sf_21);
       }
       if ((static::$need_records === true || static::$need_records >= 22) && !self::$record_22 instanceof record_adapter)
       {
         echo "generate record 22\n";
-        self::$record_sf_22 = new system_file(dirname(__FILE__) . '/testfiles/test022.swf');
+        self::$record_sf_22 = new system_file(__DIR__ . '/testfiles/test022.swf');
         self::$record_22 = record_adapter::create(self::$collection, self::$record_sf_22);
       }
       if ((static::$need_records === true || static::$need_records >= 23) && !self::$record_23 instanceof record_adapter)
       {
         echo "generate record 23\n";
-        self::$record_sf_23 = new system_file(dirname(__FILE__) . '/testfiles/test023.mp4');
+        self::$record_sf_23 = new system_file(__DIR__ . '/testfiles/test023.mp4');
         self::$record_23 = record_adapter::create(self::$collection, self::$record_sf_23);
       }
     }
diff --git a/lib/unitTest/PhraseanetPHPUnitAuthenticatedAbstract.class.inc b/lib/unitTest/PhraseanetPHPUnitAuthenticatedAbstract.class.inc
index 96fcd94f14..6134b4d7e8 100644
--- a/lib/unitTest/PhraseanetPHPUnitAuthenticatedAbstract.class.inc
+++ b/lib/unitTest/PhraseanetPHPUnitAuthenticatedAbstract.class.inc
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 use Silex\WebTestCase;
 use Symfony\Component\HttpKernel\Client;
diff --git a/lib/unitTest/PhraseanetWebTestCaseAbstract.class.inc b/lib/unitTest/PhraseanetWebTestCaseAbstract.class.inc
index 1f16747e80..6f3ab7ec47 100644
--- a/lib/unitTest/PhraseanetWebTestCaseAbstract.class.inc
+++ b/lib/unitTest/PhraseanetWebTestCaseAbstract.class.inc
@@ -15,13 +15,13 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 use Silex\WebTestCase;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\Response;
 
-abstract class PhraseanetWebTestCaseAbstract extends PhraseanetPHPUnitAbstract
+abstract class PhraseanetWebTestCaseAbstract extends \PhraseanetPHPUnitAbstract
 {
 
 }
\ No newline at end of file
diff --git a/lib/unitTest/Session/Authentication/Session_Authentication_GuestTest.php b/lib/unitTest/Session/Authentication/Session_Authentication_GuestTest.php
index 2efe5049e4..778d9df541 100644
--- a/lib/unitTest/Session/Authentication/Session_Authentication_GuestTest.php
+++ b/lib/unitTest/Session/Authentication/Session_Authentication_GuestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Authentication_Guest.
diff --git a/lib/unitTest/Session/Authentication/Session_Authentication_NativeTest.php b/lib/unitTest/Session/Authentication/Session_Authentication_NativeTest.php
index 180b03c18d..51e41a7f56 100644
--- a/lib/unitTest/Session/Authentication/Session_Authentication_NativeTest.php
+++ b/lib/unitTest/Session/Authentication/Session_Authentication_NativeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Authentication_Native.
diff --git a/lib/unitTest/Session/Authentication/Session_Authentication_PersistentCookieTest.php b/lib/unitTest/Session/Authentication/Session_Authentication_PersistentCookieTest.php
index 66232920a9..088ba71998 100644
--- a/lib/unitTest/Session/Authentication/Session_Authentication_PersistentCookieTest.php
+++ b/lib/unitTest/Session/Authentication/Session_Authentication_PersistentCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Authentication_PersistentCookie.
diff --git a/lib/unitTest/Session/Authentication/Session_Authentication_TokenTest.php b/lib/unitTest/Session/Authentication/Session_Authentication_TokenTest.php
index 6b777b87e2..ad60574965 100644
--- a/lib/unitTest/Session/Authentication/Session_Authentication_TokenTest.php
+++ b/lib/unitTest/Session/Authentication/Session_Authentication_TokenTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Authentication_Token.
diff --git a/lib/unitTest/Session/Session_HandlerTest.php b/lib/unitTest/Session/Session_HandlerTest.php
index 545d3a7bca..8ae96d1461 100644
--- a/lib/unitTest/Session/Session_HandlerTest.php
+++ b/lib/unitTest/Session/Session_HandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Handler.
diff --git a/lib/unitTest/Session/Session_LoggerTest.php b/lib/unitTest/Session/Session_LoggerTest.php
index 9ed04ea65e..e74e549e60 100644
--- a/lib/unitTest/Session/Session_LoggerTest.php
+++ b/lib/unitTest/Session/Session_LoggerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Logger.
diff --git a/lib/unitTest/Session/Session_PhraseaTest.php b/lib/unitTest/Session/Session_PhraseaTest.php
index b3c6a07884..8bb6cfae85 100644
--- a/lib/unitTest/Session/Session_PhraseaTest.php
+++ b/lib/unitTest/Session/Session_PhraseaTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Phrasea.
diff --git a/lib/unitTest/Session/Storage/Session_Storage_CommandLineTest.php b/lib/unitTest/Session/Storage/Session_Storage_CommandLineTest.php
index 018fe14197..321c09ba59 100644
--- a/lib/unitTest/Session/Storage/Session_Storage_CommandLineTest.php
+++ b/lib/unitTest/Session/Storage/Session_Storage_CommandLineTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Storage_CommandLine.
diff --git a/lib/unitTest/Session/Storage/Session_Storage_PHPSessionTest.php b/lib/unitTest/Session/Storage/Session_Storage_PHPSessionTest.php
index 83fdcbae95..d3e3bdb421 100644
--- a/lib/unitTest/Session/Storage/Session_Storage_PHPSessionTest.php
+++ b/lib/unitTest/Session/Storage/Session_Storage_PHPSessionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Session_Storage_PHPSession.
diff --git a/lib/unitTest/Setup/Setup_ConstraintTest.php b/lib/unitTest/Setup/Setup_ConstraintTest.php
index 95b2ce4eba..c7c6decd17 100644
--- a/lib/unitTest/Setup/Setup_ConstraintTest.php
+++ b/lib/unitTest/Setup/Setup_ConstraintTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Setup_Constraint.
diff --git a/lib/unitTest/Setup/Setup_UpgradeTest.php b/lib/unitTest/Setup/Setup_UpgradeTest.php
index 2c7fa44309..ccc15aa95d 100644
--- a/lib/unitTest/Setup/Setup_UpgradeTest.php
+++ b/lib/unitTest/Setup/Setup_UpgradeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for Setup_Upgrade.
diff --git a/lib/unitTest/api/oauthv2/API_OAuth2_AuthCodeTest.php b/lib/unitTest/api/oauthv2/API_OAuth2_AuthCodeTest.php
index 901a68f77f..4f89bd0583 100644
--- a/lib/unitTest/api/oauthv2/API_OAuth2_AuthCodeTest.php
+++ b/lib/unitTest/api/oauthv2/API_OAuth2_AuthCodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 class API_OAuth2_AuthCodeTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/api/oauthv2/API_OAuth2_RefreshTokenTest.php b/lib/unitTest/api/oauthv2/API_OAuth2_RefreshTokenTest.php
index 9dd681ae56..8e1b17c79e 100644
--- a/lib/unitTest/api/oauthv2/API_OAuth2_RefreshTokenTest.php
+++ b/lib/unitTest/api/oauthv2/API_OAuth2_RefreshTokenTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 class API_OAuth2_RefreshTokenTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/api/oauthv2/api_oauthv2_AccountTest.php b/lib/unitTest/api/oauthv2/api_oauthv2_AccountTest.php
index fa7dcf2157..6804eff907 100644
--- a/lib/unitTest/api/oauthv2/api_oauthv2_AccountTest.php
+++ b/lib/unitTest/api/oauthv2/api_oauthv2_AccountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 class API_OAuth2_AccountTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/api/oauthv2/api_oauthv2_ApplicationTest.php b/lib/unitTest/api/oauthv2/api_oauthv2_ApplicationTest.php
index d103441cbe..f59383d111 100644
--- a/lib/unitTest/api/oauthv2/api_oauthv2_ApplicationTest.php
+++ b/lib/unitTest/api/oauthv2/api_oauthv2_ApplicationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 class API_OAuth2_ApplicationTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/api/oauthv2/api_oauthv2_TokenTest.php b/lib/unitTest/api/oauthv2/api_oauthv2_TokenTest.php
index 44e3c7e764..9f1812a1af 100644
--- a/lib/unitTest/api/oauthv2/api_oauthv2_TokenTest.php
+++ b/lib/unitTest/api/oauthv2/api_oauthv2_TokenTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 class API_OAuth2_TokenTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/api/oauthv2/applicationTest.php b/lib/unitTest/api/oauthv2/applicationTest.php
index a8d56fb7bf..87567fd12a 100644
--- a/lib/unitTest/api/oauthv2/applicationTest.php
+++ b/lib/unitTest/api/oauthv2/applicationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 require_once __DIR__ . "/../../../../lib/vendor/Silex/autoload.php";
 /*
  * This file is part of Phraseanet
diff --git a/lib/unitTest/api/v1/api_v1_adapterTest.php b/lib/unitTest/api/v1/api_v1_adapterTest.php
index dae0553685..d9683c01a2 100644
--- a/lib/unitTest/api/v1/api_v1_adapterTest.php
+++ b/lib/unitTest/api/v1/api_v1_adapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for API_V1_adapter.
diff --git a/lib/unitTest/api/v1/api_v1_resultTest.php b/lib/unitTest/api/v1/api_v1_resultTest.php
index aa7f0ab548..9d02ce20c3 100644
--- a/lib/unitTest/api/v1/api_v1_resultTest.php
+++ b/lib/unitTest/api/v1/api_v1_resultTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once dirname(__FILE__) . "/../../../../lib/vendor/oauth2/lib/OAuth2.inc";
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../../../lib/vendor/symfony/src/Symfony/Component/Yaml/Parser.php';
+require_once __DIR__ . "/../../../../lib/vendor/oauth2/lib/OAuth2.inc";
+require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../../../lib/vendor/symfony/src/Symfony/Component/Yaml/Parser.php';
   
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/lib/unitTest/api/v1/aplicationTest.php b/lib/unitTest/api/v1/aplicationTest.php
index 8cb5565d6d..2b90bc6a2a 100644
--- a/lib/unitTest/api/v1/aplicationTest.php
+++ b/lib/unitTest/api/v1/aplicationTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../../bootstrap.php';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAbstract.class.inc';
+require_once __DIR__ . '/../../../bootstrap.php';
 API_OAuth2_Autoloader::register();
 
 use Silex\WebTestCase;
@@ -41,7 +41,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
+    return require __DIR__ . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
   }
 
   public function testRouteNotFound()
@@ -86,7 +86,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
       $databox = databox::get_instance($databox_id);
 
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
       $record_id = $record->get_record_id();
@@ -368,7 +368,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
       $databox = databox::get_instance($databox_id);
 
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -400,7 +400,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -432,7 +432,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -553,7 +553,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -589,7 +589,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -659,7 +659,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -723,7 +723,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
diff --git a/lib/unitTest/api/v1/aplicationYamlTest.php b/lib/unitTest/api/v1/aplicationYamlTest.php
index 045d530fb6..efc231b877 100644
--- a/lib/unitTest/api/v1/aplicationYamlTest.php
+++ b/lib/unitTest/api/v1/aplicationYamlTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAbstract.class.inc';
-require_once dirname(__FILE__) . '/../../../bootstrap.php';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAbstract.class.inc';
+require_once __DIR__ . '/../../../bootstrap.php';
 
 bootstrap::register_autoloads();
 API_OAuth2_Autoloader::register();
@@ -50,7 +50,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
+    return require __DIR__ . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
   }
 
   public function testRouteNotFound()
@@ -95,7 +95,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
       $databox = databox::get_instance($databox_id);
 
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
       $record_id = $record->get_record_id();
@@ -376,7 +376,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
       $databox = databox::get_instance($databox_id);
 
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -408,7 +408,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -440,7 +440,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -562,7 +562,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -598,7 +598,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -668,7 +668,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
@@ -732,7 +732,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
     {
       $databox = databox::get_instance($databox_id);
       $collection = array_shift($databox->get_collections());
-      $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg');
+      $system_file = new system_file(__DIR__ . '/../../testfiles/cestlafete.jpg');
 
       $record = record_adapter::create($collection, $system_file);
 
diff --git a/lib/unitTest/collectionTest.php b/lib/unitTest/collectionTest.php
index 421553d387..043d021722 100644
--- a/lib/unitTest/collectionTest.php
+++ b/lib/unitTest/collectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for collection.
@@ -89,7 +89,7 @@ class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
   public function testEmpty_collection()
   {
-    $record = record_adapter::create(self::$object, new system_file(dirname(__FILE__) . '/testfiles/cestlafete.jpg'));
+    $record = record_adapter::create(self::$object, new system_file(__DIR__ . '/testfiles/cestlafete.jpg'));
     $this->assertTrue(self::$object->get_record_amount() > 0);
     self::$object->empty_collection();
     $this->assertTrue(self::$object->get_record_amount() === 0);
@@ -136,7 +136,7 @@ class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
   public function testGet_record_amount()
   {
     self::$object->empty_collection();
-    $record = record_adapter::create(self::$object, new system_file(dirname(__FILE__) . '/testfiles/cestlafete.jpg'));
+    $record = record_adapter::create(self::$object, new system_file(__DIR__ . '/testfiles/cestlafete.jpg'));
     $this->assertTrue(self::$object->get_record_amount() === 1);
     self::$object->empty_collection();
     $this->assertTrue(self::$object->get_record_amount() === 0);
@@ -144,7 +144,7 @@ class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
   public function testGet_record_details()
   {
-    $record = record_adapter::create(self::$object, new system_file(dirname(__FILE__) . '/testfiles/cestlafete.jpg'));
+    $record = record_adapter::create(self::$object, new system_file(__DIR__ . '/testfiles/cestlafete.jpg'));
     $details = self::$object->get_record_details();
 
     $this->assertTrue(is_array($details));
@@ -164,7 +164,7 @@ class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
   public function testUpdate_logo()
   {
-    $pathfile = new system_file(dirname(__FILE__) . '/testfiles/logocoll.gif');
+    $pathfile = new system_file(__DIR__ . '/testfiles/logocoll.gif');
     self::$object->update_logo($pathfile);
     $this->assertEquals(file_get_contents($pathfile->getPathname()), self::$object->get_binary_minilogos());
   }
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_ContributorTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
index 4892fd3b11..46f3cba24c 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Contributor.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CoverageTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
index d21e866fa7..1a8c961e39 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Coverage.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CreatorTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
index 314618a88e..d5e0a18481 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Creator.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DateTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DateTest.php
index e72ec1df92..81f80da3a2 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DateTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Date.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
index 56585e32ec..d9e19df155 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Description.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_FormatTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_FormatTest.php
index afb43caa0f..e58b82b815 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_FormatTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_FormatTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Format.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
index 429671d132..943401ecf8 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Identifier.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_LanguageTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
index d3d2472eda..84982dc675 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Language.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_PublisherTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
index 10aa147d6f..1adf98734c 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Publisher.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RelationTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RelationTest.php
index 0fd02fe89a..47e27db0b4 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RelationTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RelationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Relation.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RightsTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RightsTest.php
index 27b7d3ae8b..dd38d38fee 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RightsTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_RightsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Rights.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SourceTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SourceTest.php
index 68ed71d254..33e0ab8a6a 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SourceTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SourceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Source.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SubjectTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
index 614f178c9c..0e03b3b20d 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Subject.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TitleTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TitleTest.php
index 8ac546cea4..25d4935905 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TitleTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TitleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Title.
diff --git a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TypeTest.php b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TypeTest.php
index d8d26db358..6b463d6d27 100644
--- a/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TypeTest.php
+++ b/lib/unitTest/databox/Field/DCES/databox_Field_DCES_TypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCES_Type.
diff --git a/lib/unitTest/databox/Field/databox_Field_DCESAbstractTest.php b/lib/unitTest/databox/Field/databox_Field_DCESAbstractTest.php
index 437029c888..68799ee526 100644
--- a/lib/unitTest/databox/Field/databox_Field_DCESAbstractTest.php
+++ b/lib/unitTest/databox/Field/databox_Field_DCESAbstractTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_Field_DCESAbstract.
diff --git a/lib/unitTest/databox/databox_cguTest.php b/lib/unitTest/databox/databox_cguTest.php
index 5a6308687a..f9d7d0b90a 100644
--- a/lib/unitTest/databox/databox_cguTest.php
+++ b/lib/unitTest/databox/databox_cguTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_cgu.
diff --git a/lib/unitTest/databox/databox_descriptionStructureTest.php b/lib/unitTest/databox/databox_descriptionStructureTest.php
index e17f736b6f..426f9efde1 100644
--- a/lib/unitTest/databox/databox_descriptionStructureTest.php
+++ b/lib/unitTest/databox/databox_descriptionStructureTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_descriptionStructure.
diff --git a/lib/unitTest/databox/databox_fieldTest.php b/lib/unitTest/databox/databox_fieldTest.php
index 12e6dbf00e..4fc527ca3f 100644
--- a/lib/unitTest/databox/databox_fieldTest.php
+++ b/lib/unitTest/databox/databox_fieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_field.
diff --git a/lib/unitTest/databox/databox_fieldUnknownTest.php b/lib/unitTest/databox/databox_fieldUnknownTest.php
index 8a73ad8fd1..9b12aea31e 100644
--- a/lib/unitTest/databox/databox_fieldUnknownTest.php
+++ b/lib/unitTest/databox/databox_fieldUnknownTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_fieldUnknown.
diff --git a/lib/unitTest/databox/databox_statusTest.php b/lib/unitTest/databox/databox_statusTest.php
index b13cc8f8bc..4d5e631080 100644
--- a/lib/unitTest/databox/databox_statusTest.php
+++ b/lib/unitTest/databox/databox_statusTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_status.
diff --git a/lib/unitTest/databox/databox_subdefAbstractTest.php b/lib/unitTest/databox/databox_subdefAbstractTest.php
index 38378099ee..d43deecb2d 100644
--- a/lib/unitTest/databox/databox_subdefAbstractTest.php
+++ b/lib/unitTest/databox/databox_subdefAbstractTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdefAbstract.
diff --git a/lib/unitTest/databox/databox_subdefsStructureTest.php b/lib/unitTest/databox/databox_subdefsStructureTest.php
index 39585f8e0c..eef3364fd8 100644
--- a/lib/unitTest/databox/databox_subdefsStructureTest.php
+++ b/lib/unitTest/databox/databox_subdefsStructureTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdefsStructure.
diff --git a/lib/unitTest/databox/subdef/databox_subdef_audioTest.php b/lib/unitTest/databox/subdef/databox_subdef_audioTest.php
index ad067b8905..6397fb8afc 100644
--- a/lib/unitTest/databox/subdef/databox_subdef_audioTest.php
+++ b/lib/unitTest/databox/subdef/databox_subdef_audioTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_audio.
diff --git a/lib/unitTest/databox/subdef/databox_subdef_documentTest.php b/lib/unitTest/databox/subdef/databox_subdef_documentTest.php
index 1134f78f73..25d81fb766 100644
--- a/lib/unitTest/databox/subdef/databox_subdef_documentTest.php
+++ b/lib/unitTest/databox/subdef/databox_subdef_documentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_document.
diff --git a/lib/unitTest/databox/subdef/databox_subdef_flashTest.php b/lib/unitTest/databox/subdef/databox_subdef_flashTest.php
index 7bcba4d6e3..2231ac3636 100644
--- a/lib/unitTest/databox/subdef/databox_subdef_flashTest.php
+++ b/lib/unitTest/databox/subdef/databox_subdef_flashTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_flash.
diff --git a/lib/unitTest/databox/subdef/databox_subdef_imageTest.php b/lib/unitTest/databox/subdef/databox_subdef_imageTest.php
index 8ece2bc41c..e7164fe6ac 100644
--- a/lib/unitTest/databox/subdef/databox_subdef_imageTest.php
+++ b/lib/unitTest/databox/subdef/databox_subdef_imageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_image.
diff --git a/lib/unitTest/databox/subdef/databox_subdef_mediatypeAbstractTest.php b/lib/unitTest/databox/subdef/databox_subdef_mediatypeAbstractTest.php
index 1ba1ad282e..341882513e 100644
--- a/lib/unitTest/databox/subdef/databox_subdef_mediatypeAbstractTest.php
+++ b/lib/unitTest/databox/subdef/databox_subdef_mediatypeAbstractTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_mediatypeAbstract.
diff --git a/lib/unitTest/databox/subdef/databox_subdef_videoTest.php b/lib/unitTest/databox/subdef/databox_subdef_videoTest.php
index 7cd6e8021b..6a29159937 100644
--- a/lib/unitTest/databox/subdef/databox_subdef_videoTest.php
+++ b/lib/unitTest/databox/subdef/databox_subdef_videoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_video.
diff --git a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_audioTest.php b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_audioTest.php
index d9d39a1698..9c6939d54e 100644
--- a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_audioTest.php
+++ b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_audioTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_mediatype_audio.
diff --git a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_flexpaperTest.php b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_flexpaperTest.php
index 74c5b24179..fcea86ab0d 100644
--- a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_flexpaperTest.php
+++ b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_flexpaperTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_mediatype_flexpaper.
diff --git a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_gifTest.php b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_gifTest.php
index ed25fef54e..6ae94e8635 100644
--- a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_gifTest.php
+++ b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_gifTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_mediatype_gif.
diff --git a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_imageTest.php b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_imageTest.php
index 53d26f962c..6aa098a624 100644
--- a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_imageTest.php
+++ b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_imageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_mediatype_image.
diff --git a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_videoTest.php b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_videoTest.php
index 0a4c3f23d2..cbec52a13b 100644
--- a/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_videoTest.php
+++ b/lib/unitTest/databox/subdef/mediatype/databox_subdef_mediatype_videoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for databox_subdef_mediatype_video.
diff --git a/lib/unitTest/formatTest.php b/lib/unitTest/formatTest.php
index cf522cc769..8d73770815 100644
--- a/lib/unitTest/formatTest.php
+++ b/lib/unitTest/formatTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for format.
diff --git a/lib/unitTest/geonamesTest.php b/lib/unitTest/geonamesTest.php
index 94dd4d9c06..5f18d335a7 100644
--- a/lib/unitTest/geonamesTest.php
+++ b/lib/unitTest/geonamesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for geonames.
diff --git a/lib/unitTest/http/http_requestTest.php b/lib/unitTest/http/http_requestTest.php
index 649ad670a3..08347215f9 100644
--- a/lib/unitTest/http/http_requestTest.php
+++ b/lib/unitTest/http/http_requestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for http_request.
diff --git a/lib/unitTest/lazaretFileTest.php b/lib/unitTest/lazaretFileTest.php
index 9be5ce6927..6e4fcc4785 100644
--- a/lib/unitTest/lazaretFileTest.php
+++ b/lib/unitTest/lazaretFileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for lazaretFile.
diff --git a/lib/unitTest/lazaretTest.php b/lib/unitTest/lazaretTest.php
index 8d37a70d53..5635db9dc9 100644
--- a/lib/unitTest/lazaretTest.php
+++ b/lib/unitTest/lazaretTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for lazaret.
diff --git a/lib/unitTest/listeTest.php b/lib/unitTest/listeTest.php
index 1a68f28e80..0e1a7dd4a3 100644
--- a/lib/unitTest/listeTest.php
+++ b/lib/unitTest/listeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for liste.
diff --git a/lib/unitTest/loginTest.php b/lib/unitTest/loginTest.php
index 95664aabe6..37509f5c9c 100644
--- a/lib/unitTest/loginTest.php
+++ b/lib/unitTest/loginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for login.
diff --git a/lib/unitTest/logsTest.php b/lib/unitTest/logsTest.php
index 37bf89fb8a..d519c68d93 100644
--- a/lib/unitTest/logsTest.php
+++ b/lib/unitTest/logsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for logs.
diff --git a/lib/unitTest/mailTest.php b/lib/unitTest/mailTest.php
index cf560fda08..00aa21f48b 100644
--- a/lib/unitTest/mailTest.php
+++ b/lib/unitTest/mailTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for mail.
diff --git a/lib/unitTest/media/Permalink/media_Permalink_AdapterTest.php b/lib/unitTest/media/Permalink/media_Permalink_AdapterTest.php
index e83f471668..d3535c3d5b 100644
--- a/lib/unitTest/media/Permalink/media_Permalink_AdapterTest.php
+++ b/lib/unitTest/media/Permalink/media_Permalink_AdapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for media_Permalink_Adapter.
diff --git a/lib/unitTest/metadata/description/descriptionTest.php b/lib/unitTest/metadata/description/descriptionTest.php
index 627812e66a..6264355446 100644
--- a/lib/unitTest/metadata/description/descriptionTest.php
+++ b/lib/unitTest/metadata/description/descriptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for geonames.
diff --git a/lib/unitTest/module/console/module_console_aboutAuthorsTest.php b/lib/unitTest/module/console/module_console_aboutAuthorsTest.php
index 9690ba2afe..db9d2a72c1 100644
--- a/lib/unitTest/module/console/module_console_aboutAuthorsTest.php
+++ b/lib/unitTest/module/console/module_console_aboutAuthorsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
@@ -33,7 +33,7 @@ class module_console_aboutAuthorsTest extends PHPUnit_Framework_TestCase
     $commandTester->execute(array('command' => $command->getName()));
 
     $this->assertEquals(
-            trim(file_get_contents(dirname(__FILE__) . '/../../../../AUTHORS'))
+            trim(file_get_contents(__DIR__ . '/../../../../AUTHORS'))
             , trim($commandTester->getDisplay())
     );
   }
diff --git a/lib/unitTest/module/console/module_console_aboutLicenseTest.php b/lib/unitTest/module/console/module_console_aboutLicenseTest.php
index 8a4bb23dc0..c6b4e080af 100644
--- a/lib/unitTest/module/console/module_console_aboutLicenseTest.php
+++ b/lib/unitTest/module/console/module_console_aboutLicenseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
@@ -30,7 +30,7 @@ class module_console_aboutLicenseTest extends PHPUnit_Framework_TestCase
     $commandTester->execute(array('command' => $command->getName()));
 
     $this->assertEquals(
-            trim(file_get_contents(dirname(__FILE__) . '/../../../../LICENSE'))
+            trim(file_get_contents(__DIR__ . '/../../../../LICENSE'))
             , trim($commandTester->getDisplay())
     );
   }
diff --git a/lib/unitTest/module/console/module_console_schedulerStartTest.php b/lib/unitTest/module/console/module_console_schedulerStartTest.php
index 4cdc6aa828..e116e13552 100644
--- a/lib/unitTest/module/console/module_console_schedulerStartTest.php
+++ b/lib/unitTest/module/console/module_console_schedulerStartTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
diff --git a/lib/unitTest/module/console/module_console_schedulerStateTest.php b/lib/unitTest/module/console/module_console_schedulerStateTest.php
index aad97ca08f..75f0ffacba 100644
--- a/lib/unitTest/module/console/module_console_schedulerStateTest.php
+++ b/lib/unitTest/module/console/module_console_schedulerStateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
diff --git a/lib/unitTest/module/console/module_console_systemTemplateGeneratorTest.php b/lib/unitTest/module/console/module_console_systemTemplateGeneratorTest.php
index 761f88dba0..d553e9c669 100644
--- a/lib/unitTest/module/console/module_console_systemTemplateGeneratorTest.php
+++ b/lib/unitTest/module/console/module_console_systemTemplateGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
diff --git a/lib/unitTest/module/console/module_console_systemUpgradeTest.php b/lib/unitTest/module/console/module_console_systemUpgradeTest.php
index 3c655e341a..5822ae2361 100644
--- a/lib/unitTest/module/console/module_console_systemUpgradeTest.php
+++ b/lib/unitTest/module/console/module_console_systemUpgradeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
diff --git a/lib/unitTest/module/console/module_console_tasklistTest.php b/lib/unitTest/module/console/module_console_tasklistTest.php
index 5f6d1e43b0..96551ced75 100644
--- a/lib/unitTest/module/console/module_console_tasklistTest.php
+++ b/lib/unitTest/module/console/module_console_tasklistTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
diff --git a/lib/unitTest/module/console/module_console_taskrunTest.php b/lib/unitTest/module/console/module_console_taskrunTest.php
index 678da592a4..710f49cc2e 100644
--- a/lib/unitTest/module/console/module_console_taskrunTest.php
+++ b/lib/unitTest/module/console/module_console_taskrunTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
 use Symfony\Component\Console\Tester\CommandTester;
 use \Symfony\Component\Console\Application;
diff --git a/lib/unitTest/p4fieldTest.php b/lib/unitTest/p4fieldTest.php
index f84a129571..522f9a2c25 100644
--- a/lib/unitTest/p4fieldTest.php
+++ b/lib/unitTest/p4fieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for p4field.
diff --git a/lib/unitTest/p4fileTest.php b/lib/unitTest/p4fileTest.php
index db0ba85138..d94cbee1b0 100644
--- a/lib/unitTest/p4fileTest.php
+++ b/lib/unitTest/p4fileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for p4file.
diff --git a/lib/unitTest/p4stringTest.php b/lib/unitTest/p4stringTest.php
index 848915172c..fcaf1b9880 100644
--- a/lib/unitTest/p4stringTest.php
+++ b/lib/unitTest/p4stringTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for p4string.
diff --git a/lib/unitTest/phraseaTest.php b/lib/unitTest/phraseaTest.php
index 0bd6b3f012..089c736ae2 100644
--- a/lib/unitTest/phraseaTest.php
+++ b/lib/unitTest/phraseaTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for phrasea.
diff --git a/lib/unitTest/phraseadateTest.php b/lib/unitTest/phraseadateTest.php
index bc18e8508d..b3f0d26453 100644
--- a/lib/unitTest/phraseadateTest.php
+++ b/lib/unitTest/phraseadateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for phraseadate.
diff --git a/lib/unitTest/queriesTest.php b/lib/unitTest/queriesTest.php
index 8a1fac9023..4643d28c34 100644
--- a/lib/unitTest/queriesTest.php
+++ b/lib/unitTest/queriesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for queries.
diff --git a/lib/unitTest/randomTest.php b/lib/unitTest/randomTest.php
index 4ff9663c54..a948df05c9 100644
--- a/lib/unitTest/randomTest.php
+++ b/lib/unitTest/randomTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for random.
diff --git a/lib/unitTest/record/adapterTest.php b/lib/unitTest/record/adapterTest.php
index 67aa823284..86b8fb26b9 100644
--- a/lib/unitTest/record/adapterTest.php
+++ b/lib/unitTest/record/adapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for record_adapter.
@@ -30,7 +30,7 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
     $metadatas = $system_file->extract_metadatas($databox->get_meta_structure());
     static::$record_23->set_metadatas($metadatas['metadatas']);
 
-    $system_file = new system_file(dirname(__FILE__) . '/../testfiles/cestlafete.jpg');
+    $system_file = new system_file(__DIR__ . '/../testfiles/cestlafete.jpg');
   }
 
   public static function tearDownAfterClass()
@@ -195,7 +195,7 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
     if (!($coll instanceof collection))
       $this->fail('Unable to find a collection');
 
-    $record = record_adapter::create($coll, new system_file(dirname(__FILE__) . '/../testfiles/cestlafete.jpg'));
+    $record = record_adapter::create($coll, new system_file(__DIR__ . '/../testfiles/cestlafete.jpg'));
 
     $this->assertEquals('image/jpeg', $record->get_mime());
     $record->delete();
diff --git a/lib/unitTest/recordutilsTest.php b/lib/unitTest/recordutilsTest.php
index d3e080f8b8..501f48e203 100644
--- a/lib/unitTest/recordutilsTest.php
+++ b/lib/unitTest/recordutilsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for recordutils.
diff --git a/lib/unitTest/registryTest.php b/lib/unitTest/registryTest.php
index c9e9788da0..a809bebdd8 100644
--- a/lib/unitTest/registryTest.php
+++ b/lib/unitTest/registryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for registry.
diff --git a/lib/unitTest/registry_setupTest.php b/lib/unitTest/registry_setupTest.php
index 5761ebf432..67adc2e832 100644
--- a/lib/unitTest/registry_setupTest.php
+++ b/lib/unitTest/registry_setupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for registry_setup.
diff --git a/lib/unitTest/report/activityTest.php b/lib/unitTest/report/activityTest.php
index 18d3eb817a..b8481b89c5 100644
--- a/lib/unitTest/report/activityTest.php
+++ b/lib/unitTest/report/activityTest.php
@@ -16,7 +16,7 @@
  * @link        www.phraseanet.com
  */
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class activityTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/addTest.php b/lib/unitTest/report/addTest.php
index 346747621f..8199e8b56a 100644
--- a/lib/unitTest/report/addTest.php
+++ b/lib/unitTest/report/addTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class addReportTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/connexionReportTest.php b/lib/unitTest/report/connexionReportTest.php
index 09087c8891..4630126b20 100644
--- a/lib/unitTest/report/connexionReportTest.php
+++ b/lib/unitTest/report/connexionReportTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class connexionReportTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/dashboardTest.php b/lib/unitTest/report/dashboardTest.php
index 494e67b8c5..5e53ca90a4 100644
--- a/lib/unitTest/report/dashboardTest.php
+++ b/lib/unitTest/report/dashboardTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class dashboardTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/downloadReportTest.php b/lib/unitTest/report/downloadReportTest.php
index 6b8bcd2dfa..6ac7751f71 100644
--- a/lib/unitTest/report/downloadReportTest.php
+++ b/lib/unitTest/report/downloadReportTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class downloadReportTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/editTest.php b/lib/unitTest/report/editTest.php
index 38db08227a..ef32ddcf51 100644
--- a/lib/unitTest/report/editTest.php
+++ b/lib/unitTest/report/editTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class editTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/filterTest.php b/lib/unitTest/report/filterTest.php
index 3414dd851a..4137695260 100644
--- a/lib/unitTest/report/filterTest.php
+++ b/lib/unitTest/report/filterTest.php
@@ -16,7 +16,7 @@
  * @link        www.phraseanet.com
  */
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class filterTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/pushTest.php b/lib/unitTest/report/pushTest.php
index 86e84f657c..0428a23a11 100644
--- a/lib/unitTest/report/pushTest.php
+++ b/lib/unitTest/report/pushTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class pushReportTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/questionReportTest.php b/lib/unitTest/report/questionReportTest.php
index db2a099507..573f2e1d2d 100644
--- a/lib/unitTest/report/questionReportTest.php
+++ b/lib/unitTest/report/questionReportTest.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class questionReportTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/reportTest.php b/lib/unitTest/report/reportTest.php
index 7b2e2f6623..53ff9c8c2c 100644
--- a/lib/unitTest/report/reportTest.php
+++ b/lib/unitTest/report/reportTest.php
@@ -16,7 +16,7 @@
  * @link        www.phraseanet.com
  */
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 class reportTest extends PhraseanetPHPUnitAbstract
 {
diff --git a/lib/unitTest/report/sqlActionTest.php b/lib/unitTest/report/sqlActionTest.php
index 3dd9b0783a..35526bf1ec 100644
--- a/lib/unitTest/report/sqlActionTest.php
+++ b/lib/unitTest/report/sqlActionTest.php
@@ -16,7 +16,7 @@
  * @link        www.phraseanet.com
  */
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 
 class sqlActionTest extends PhraseanetPHPUnitAbstract
diff --git a/lib/unitTest/report/sqlFilterTest.php b/lib/unitTest/report/sqlFilterTest.php
index cba32f88f4..4f39b298fe 100644
--- a/lib/unitTest/report/sqlFilterTest.php
+++ b/lib/unitTest/report/sqlFilterTest.php
@@ -16,7 +16,7 @@
  * @link        www.phraseanet.com
  */
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 
 class sqlFilterTest extends PhraseanetPHPUnitAbstract
diff --git a/lib/unitTest/report/sqlTest.php b/lib/unitTest/report/sqlTest.php
index 44426e7ebe..b86f461a59 100644
--- a/lib/unitTest/report/sqlTest.php
+++ b/lib/unitTest/report/sqlTest.php
@@ -16,7 +16,7 @@
  * @link        www.phraseanet.com
  */
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 
 class sqlTest extends PhraseanetPHPUnitAbstract
diff --git a/lib/unitTest/searchEngine_optionsTest.php b/lib/unitTest/searchEngine_optionsTest.php
index 11e9e47e3d..e3c9556619 100644
--- a/lib/unitTest/searchEngine_optionsTest.php
+++ b/lib/unitTest/searchEngine_optionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 
 /**
  * Test class for searchEngine_options.
diff --git a/lib/unitTest/setupTest.php b/lib/unitTest/setupTest.php
index 108c3a8a98..109841f393 100644
--- a/lib/unitTest/setupTest.php
+++ b/lib/unitTest/setupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for setup.
diff --git a/lib/unitTest/sphinxrtTest.php b/lib/unitTest/sphinxrtTest.php
index bb54a807ed..3eedcf0278 100644
--- a/lib/unitTest/sphinxrtTest.php
+++ b/lib/unitTest/sphinxrtTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for sphinxrt.
diff --git a/lib/unitTest/supertwigTest.php b/lib/unitTest/supertwigTest.php
index 71bb7e1326..c80e20a3e7 100644
--- a/lib/unitTest/supertwigTest.php
+++ b/lib/unitTest/supertwigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for supertwig.
diff --git a/lib/unitTest/system/system_fileTest.php b/lib/unitTest/system/system_fileTest.php
index 163f79d9fa..fd4b652c2c 100644
--- a/lib/unitTest/system/system_fileTest.php
+++ b/lib/unitTest/system/system_fileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for system_file.
@@ -16,9 +16,9 @@ class system_fileTest extends PhraseanetPHPUnitAbstract
 
   public function setUp()
   {
-    $this->objects['indd'] = new system_file(dirname(__FILE__) . '/../../vendor/exiftool/t/images/InDesign.indd');
-    $this->objects['wav'] = new system_file(dirname(__FILE__) . '/../testfiles/test012.wav');
-    $this->objects['jpg'] = new system_file(dirname(__FILE__) . '/../../vendor/exiftool/t/images/Casio.jpg');
+    $this->objects['indd'] = new system_file(__DIR__ . '/../../vendor/exiftool/t/images/InDesign.indd');
+    $this->objects['wav'] = new system_file(__DIR__ . '/../testfiles/test012.wav');
+    $this->objects['jpg'] = new system_file(__DIR__ . '/../../vendor/exiftool/t/images/Casio.jpg');
   }
 
   public function testGet_mime()
@@ -83,7 +83,7 @@ class system_fileTest extends PhraseanetPHPUnitAbstract
 
   public function testGetPath()
   {
-    $supposed = dirname(__FILE__) . '/../../vendor/exiftool/t/images/';
+    $supposed = __DIR__ . '/../../vendor/exiftool/t/images/';
     $this->assertEquals($supposed, $this->objects['indd']->getPath());
   }
 
@@ -155,7 +155,7 @@ class system_fileTest extends PhraseanetPHPUnitAbstract
 
   public function testMkdir()
   {
-    $path = dirname(__FILE__) . '/test/dir/to/create/';
+    $path = __DIR__ . '/test/dir/to/create/';
     if (is_dir($path))
     {
       $this->fail('unable to create directory : directory already extists');
@@ -168,14 +168,14 @@ class system_fileTest extends PhraseanetPHPUnitAbstract
     $path = dirname($path);
     rmdir($path);
     $path = dirname($path);
-    rmdir(dirname(__FILE__) . '/test');
+    rmdir(__DIR__ . '/test');
     $path = dirname($path);
   }
 
   public function testChmod()
   {
-    $file = dirname(__FILE__) . '/../testfiles/cestlafete.jpg';
-    $dir = dirname(__FILE__) . '/testchmod';
+    $file = __DIR__ . '/../testfiles/cestlafete.jpg';
+    $dir = __DIR__ . '/testchmod';
     system_file::mkdir($dir);
 
     chmod($file, 0700);
@@ -192,8 +192,8 @@ class system_fileTest extends PhraseanetPHPUnitAbstract
 
   public function testEmpty_directory()
   {
-    $file = dirname(__FILE__) . '/../testfiles/cestlafete.jpg';
-    $dir = dirname(__FILE__) . '/testchmod';
+    $file = __DIR__ . '/../testfiles/cestlafete.jpg';
+    $dir = __DIR__ . '/testchmod';
     system_file::mkdir($dir);
 
     copy($file, $dir . '/v1.test');
diff --git a/lib/unitTest/system/system_serverTest.php b/lib/unitTest/system/system_serverTest.php
index 908ff8266c..f45d6c05b2 100644
--- a/lib/unitTest/system/system_serverTest.php
+++ b/lib/unitTest/system/system_serverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for system_server.
diff --git a/lib/unitTest/system/system_urlTest.php b/lib/unitTest/system/system_urlTest.php
index 4f102ca700..916b67df76 100644
--- a/lib/unitTest/system/system_urlTest.php
+++ b/lib/unitTest/system/system_urlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for system_url.
diff --git a/lib/unitTest/task/task_abstractTest.php b/lib/unitTest/task/task_abstractTest.php
index 8c5728ab3a..04fb87a113 100644
--- a/lib/unitTest/task/task_abstractTest.php
+++ b/lib/unitTest/task/task_abstractTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for task_abstract.
diff --git a/lib/unitTest/thesaurusTest.php b/lib/unitTest/thesaurusTest.php
index bacd0d797a..5c31743ce8 100644
--- a/lib/unitTest/thesaurusTest.php
+++ b/lib/unitTest/thesaurusTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for thesaurus.
diff --git a/lib/unitTest/unicodeTest.php b/lib/unitTest/unicodeTest.php
index 0c0af2d5ce..aa4756f95a 100644
--- a/lib/unitTest/unicodeTest.php
+++ b/lib/unitTest/unicodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for unicode.
diff --git a/lib/unitTest/unitTestsTest.php b/lib/unitTest/unitTestsTest.php
index 6390207af6..d81dde1372 100644
--- a/lib/unitTest/unitTestsTest.php
+++ b/lib/unitTest/unitTestsTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for random.
@@ -10,7 +10,7 @@ class unitTestsTest extends PhraseanetPHPUnitAbstract
 
   public function testFiles()
   {
-    $testDir = dirname(__FILE__).'/';
+    $testDir = __DIR__.'/';
     foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($testDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file)
     {
       if (strpos($file, '/.svn/') !== false)
diff --git a/lib/unitTest/userTest.php b/lib/unitTest/userTest.php
index 4bcc3d3912..3231c61fe8 100644
--- a/lib/unitTest/userTest.php
+++ b/lib/unitTest/userTest.php
@@ -10,7 +10,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  *
diff --git a/lib/unitTest/uuidTest.php b/lib/unitTest/uuidTest.php
index eb5283d1b5..3b0f87e292 100644
--- a/lib/unitTest/uuidTest.php
+++ b/lib/unitTest/uuidTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
 
 /**
  * Test class for uuid.