Merge pull request #57 from mentalstring/master

Replace `dirname(__FILE__)` by `__DIR__` since PHP 5.3.4 is required

Author: GromNaN

autoload.php

@@ -1,5 +1,5 @@
 <?php
 
-require_once dirname(__FILE__).'/lib/autoload/sfCoreAutoload.class.php';
+require_once __DIR__.'/lib/autoload/sfCoreAutoload.class.php';
 
 sfCoreAutoload::register();

data/bin/changelog.php

@@ -17,7 +17,7 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
-require_once dirname(__FILE__).'/../../lib/task/sfFilesystem.class.php';
+require_once __DIR__.'/../../lib/task/sfFilesystem.class.php';
 
 if (!isset($argv[1]))
 {

data/bin/release.php

@@ -17,10 +17,10 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
-require_once(dirname(__FILE__).'/../../lib/exception/sfException.class.php');
-require_once(dirname(__FILE__).'/../../lib/task/sfFilesystem.class.php');
-require_once(dirname(__FILE__).'/../../lib/util/sfFinder.class.php');
-require_once(dirname(__FILE__).'/../../lib/vendor/lime/lime.php');
+require_once(__DIR__.'/../../lib/exception/sfException.class.php');
+require_once(__DIR__.'/../../lib/task/sfFilesystem.class.php');
+require_once(__DIR__.'/../../lib/util/sfFinder.class.php');
+require_once(__DIR__.'/../../lib/vendor/lime/lime.php');
 
 if (!isset($argv[1]))
 {

data/bin/sandbox_installer.php

@@ -1,12 +1,12 @@
 <?php
 
-$this->installDir(dirname(__FILE__).'/sandbox_skeleton');
+$this->installDir(__DIR__.'/sandbox_skeleton');
 
 $this->logSection('install', 'add symfony CLI for Windows users');
-$this->getFilesystem()->copy(dirname(__FILE__).'/symfony.bat', sfConfig::get('sf_root_dir').'/symfony.bat');
+$this->getFilesystem()->copy(__DIR__.'/symfony.bat', sfConfig::get('sf_root_dir').'/symfony.bat');
 
 $this->logSection('install', 'add LICENSE');
-$this->getFilesystem()->copy(dirname(__FILE__).'/../../LICENSE', sfConfig::get('sf_root_dir').'/LICENSE');
+$this->getFilesystem()->copy(__DIR__.'/../../LICENSE', sfConfig::get('sf_root_dir').'/LICENSE');
 
 $this->logSection('install', 'default to sqlite');
 $this->runTask('configure:database', sprintf("'sqlite:%s/sandbox.db'", sfConfig::get('sf_data_dir')));

data/bin/symfony

@@ -17,10 +17,10 @@ if (file_exists('config/ProjectConfiguration.class.php'))
 }
 else
 {
-  if (is_readable(dirname(__FILE__).'/../../lib/autoload/sfCoreAutoload.class.php'))
+  if (is_readable(__DIR__.'/../../lib/autoload/sfCoreAutoload.class.php'))
   {
     // SVN
-    $dir = realpath(dirname(__FILE__).'/../../lib');
+    $dir = realpath(__DIR__.'/../../lib');
   }
   else
   {

lib/autoload/sfCoreAutoload.class.php

@@ -36,7 +36,7 @@ class sfCoreAutoload
 
   protected function __construct()
   {
-    $this->baseDir = realpath(dirname(__FILE__).'/..');
+    $this->baseDir = realpath(__DIR__.'/..');
   }
 
   /**
@@ -141,7 +141,7 @@ public function getBaseDir()
    */
   static public function make()
   {
-    $libDir = str_replace(DIRECTORY_SEPARATOR, '/', realpath(dirname(__FILE__).DIRECTORY_SEPARATOR.'..'));
+    $libDir = str_replace(DIRECTORY_SEPARATOR, '/', realpath(__DIR__.DIRECTORY_SEPARATOR.'..'));
     require_once $libDir.'/util/sfFinder.class.php';
 
     $files = sfFinder::type('file')

lib/cache/sfCache.class.php

@@ -57,7 +57,7 @@ public function initialize($options = array())
     $this->options = array_merge(array(
       'automatic_cleaning_factor' => 1000,
       'lifetime'                  => 86400,
-      'prefix'                    => md5(dirname(__FILE__)),
+      'prefix'                    => md5(__DIR__),
     ), $options);
 
     $this->options['prefix'] .= self::SEPARATOR;

lib/command/cli.php

@@ -9,15 +9,15 @@
  */
 
 // Try autoloading using composer if available.
-if (!file_exists($autoload = dirname(__FILE__).'/../../../../autoload.php'))
+if (!file_exists($autoload = __DIR__.'/../../../../autoload.php'))
 {
-  $autoload = dirname(__FILE__).'/../../autoload.php';
+  $autoload = __DIR__.'/../../autoload.php';
 }
 
 // Fall back to classic Symfony loading
 if (!file_exists($autoload))
 {
-  require_once(dirname(__FILE__).'/../autoload/sfCoreAutoload.class.php');
+  require_once(__DIR__.'/../autoload/sfCoreAutoload.class.php');
   sfCoreAutoload::register();
 }
 else
@@ -30,7 +30,7 @@
   $dispatcher = new sfEventDispatcher();
   $logger = new sfCommandLogger($dispatcher);
 
-  $application = new sfSymfonyCommandApplication($dispatcher, null, array('symfony_lib_dir' => realpath(dirname(__FILE__).'/..')));
+  $application = new sfSymfonyCommandApplication($dispatcher, null, array('symfony_lib_dir' => realpath(__DIR__.'/..')));
   $statusCode = $application->run();
 }
 catch (Exception $e)

lib/config/sfProjectConfiguration.class.php

@@ -45,7 +45,7 @@ public function __construct($rootDir = null, sfEventDispatcher $dispatcher = nul
     }
 
     $this->rootDir = null === $rootDir ? self::guessRootDir() : realpath($rootDir);
-    $this->symfonyLibDir = realpath(dirname(__FILE__).'/..');
+    $this->symfonyLibDir = realpath(__DIR__.'/..');
     $this->dispatcher = null === $dispatcher ? new sfEventDispatcher() : $dispatcher;
 
     ini_set('magic_quotes_runtime', 'off');

lib/controller/default/templates/disabledSuccess.php

@@ -1,4 +1,4 @@
-<?php decorate_with(dirname(__FILE__).'/defaultLayout.php') ?>
+<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
 
 <div class="sfTMessageContainer sfTAlert"> 
   <?php echo image_tag('/sf/sf_default/images/icons/disabled48.png', array('alt' => 'module disabled', 'class' => 'sfTMessageIcon', 'size' => '48x48')) ?>