Cleaned some file class names + removed some require_once + added sfServiceContainer* classes to core_compile

jeromemacias · jeromemacias · commit 10d535c80eec · 2012-03-18T23:50:11.000+01:00
diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
@@ -260,8 +260,8 @@ static public function make()
     'sfoutputescaperiteratordecorator' => 'escaper/sfOutputEscaperIteratorDecorator.class.php',
     'sfoutputescaperobjectdecorator' => 'escaper/sfOutputEscaperObjectDecorator.class.php',
     'sfoutputescapersafe' => 'escaper/sfOutputEscaperSafe.class.php',
-    'sfevent' => 'event_dispatcher/sfEvent.php',
-    'sfeventdispatcher' => 'event_dispatcher/sfEventDispatcher.php',
+    'sfevent' => 'event/sfEvent.class.php',
+    'sfeventdispatcher' => 'event/sfEventDispatcher.class.php',
     'sfcacheexception' => 'exception/sfCacheException.class.php',
     'sfconfigurationexception' => 'exception/sfConfigurationException.class.php',
     'sfcontrollerexception' => 'exception/sfControllerException.class.php',
@@ -362,19 +362,19 @@ static public function make()
     'sfroute' => 'routing/sfRoute.class.php',
     'sfroutecollection' => 'routing/sfRouteCollection.class.php',
     'sfrouting' => 'routing/sfRouting.class.php',
-    'sfservicecontainer' => 'service/sfServiceContainer.php',
-    'sfservicecontainerbuilder' => 'service/sfServiceContainerBuilder.php',
-    'sfservicecontainerdumper' => 'service/sfServiceContainerDumper.php',
-    'sfservicecontainerdumpergraphviz' => 'service/sfServiceContainerDumperGraphviz.php',
-    'sfservicecontainerdumperinterface' => 'service/sfServiceContainerDumperInterface.php',
-    'sfservicecontainerdumperphp' => 'service/sfServiceContainerDumperPhp.php',
-    'sfservicecontainerinterface' => 'service/sfServiceContainerInterface.php',
-    'sfservicecontainerloader' => 'service/sfServiceContainerLoader.php',
-    'sfservicecontainerloaderarray' => 'service/sfServiceContainerLoaderArray.php',
-    'sfservicecontainerloaderinterface' => 'service/sfServiceContainerLoaderInterface.php',
-    'sfservicedefinition' => 'service/sfServiceDefinition.php',
-    'sfserviceparameter' => 'service/sfServiceParameter.php',
-    'sfservicereference' => 'service/sfServiceReference.php',
+    'sfservicecontainer' => 'service/sfServiceContainer.class.php',
+    'sfservicecontainerbuilder' => 'service/sfServiceContainerBuilder.class.php',
+    'sfservicecontainerdumper' => 'service/sfServiceContainerDumper.class.php',
+    'sfservicecontainerdumpergraphviz' => 'service/sfServiceContainerDumperGraphviz.class.php',
+    'sfservicecontainerdumperinterface' => 'service/sfServiceContainerDumperInterface.class.php',
+    'sfservicecontainerdumperphp' => 'service/sfServiceContainerDumperPhp.class.php',
+    'sfservicecontainerinterface' => 'service/sfServiceContainerInterface.class.php',
+    'sfservicecontainerloader' => 'service/sfServiceContainerLoader.class.php',
+    'sfservicecontainerloaderarray' => 'service/sfServiceContainerLoaderArray.class.php',
+    'sfservicecontainerloaderinterface' => 'service/sfServiceContainerLoaderInterface.class.php',
+    'sfservicedefinition' => 'service/sfServiceDefinition.class.php',
+    'sfserviceparameter' => 'service/sfServiceParameter.class.php',
+    'sfservicereference' => 'service/sfServiceReference.class.php',
     'sfcachesessionstorage' => 'storage/sfCacheSessionStorage.class.php',
     'sfdatabasesessionstorage' => 'storage/sfDatabaseSessionStorage.class.php',
     'sfmysqlsessionstorage' => 'storage/sfMySQLSessionStorage.class.php',
@@ -529,9 +529,9 @@ static public function make()
     'sfwidgetformselectradio' => 'widget/sfWidgetFormSelectRadio.class.php',
     'sfwidgetformtextarea' => 'widget/sfWidgetFormTextarea.class.php',
     'sfwidgetformtime' => 'widget/sfWidgetFormTime.class.php',
-    'sfyaml' => 'yaml/sfYaml.php',
-    'sfyamldumper' => 'yaml/sfYamlDumper.php',
-    'sfyamlinline' => 'yaml/sfYamlInline.php',
-    'sfyamlparser' => 'yaml/sfYamlParser.php',
+    'sfyaml' => 'yaml/sfYaml.class.php',
+    'sfyamldumper' => 'yaml/sfYamlDumper.class.php',
+    'sfyamlinline' => 'yaml/sfYamlInline.class.php',
+    'sfyamlparser' => 'yaml/sfYamlParser.class.php',
   );
 }
diff --git a/lib/config/config/core_compile.yml b/lib/config/config/core_compile.yml
@@ -20,6 +20,10 @@
 - %SF_SYMFONY_LIB_DIR%/util/sfNamespacedParameterHolder.class.php
 - %SF_SYMFONY_LIB_DIR%/view/sfView.class.php
 - %SF_SYMFONY_LIB_DIR%/view/sfViewParameterHolder.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainer.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerBuilder.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerLoader.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerLoaderArray.class.php
 
 # these classes are optionals but very likely to be used (in web context)
 - %SF_SYMFONY_LIB_DIR%/controller/sfWebController.class.php
diff --git a/lib/event/sfEvent.class.php b/lib/event/sfEvent.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,7 +12,7 @@
  * sfEvent.
  *
  * @package    symfony
- * @subpackage event_dispatcher
+ * @subpackage event
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfEvent.class.php 8698 2008-04-30 16:35:28Z fabien $
  */
@@ -143,7 +143,7 @@ public function offsetGet($name)
    * Sets a parameter (implements the ArrayAccess interface).
    *
    * @param string  $name   The parameter name
-   * @param mixed   $value  The parameter value 
+   * @param mixed   $value  The parameter value
    */
   public function offsetSet($name, $value)
   {
diff --git a/lib/event/sfEventDispatcher.class.php b/lib/event/sfEventDispatcher.class.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once dirname(__FILE__).'/sfEvent.php';
-
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -16,7 +14,7 @@
  * @see http://developer.apple.com/documentation/Cocoa/Conceptual/Notifications/index.html Apple's Cocoa framework
  *
  * @package    symfony
- * @subpackage event_dispatcher
+ * @subpackage event
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfEventDispatcher.class.php 10631 2008-08-03 16:50:47Z fabien $
  */
diff --git a/lib/service/sfServiceContainer.class.php b/lib/service/sfServiceContainer.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -37,7 +37,7 @@
  * </ul>
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
diff --git a/lib/service/sfServiceContainerBuilder.class.php b/lib/service/sfServiceContainerBuilder.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@
  * sfServiceContainerBuilder is a DI container that provides an interface to build the services.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfServiceContainerBuilder.php 269 2009-03-26 20:39:16Z fabien $
  */
diff --git a/lib/service/sfServiceContainerDumper.class.php b/lib/service/sfServiceContainerDumper.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@
  * sfServiceContainerDumper is the abstract class for all built-in dumpers.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
diff --git a/lib/service/sfServiceContainerDumperGraphviz.class.php b/lib/service/sfServiceContainerDumperGraphviz.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +16,7 @@
  *   dot -Tpng container.dot > foo.png
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
diff --git a/lib/service/sfServiceContainerDumperInterface.class.php b/lib/service/sfServiceContainerDumperInterface.class.php
diff --git a/lib/service/sfServiceContainerDumperPhp.class.php b/lib/service/sfServiceContainerDumperPhp.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@
  * sfServiceContainerDumperPhp dumps a service container as a PHP class.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
diff --git a/lib/service/sfServiceContainerInterface.class.php b/lib/service/sfServiceContainerInterface.class.php
@@ -12,7 +12,7 @@
  * sfServiceContainerInterface is the interface implemented by service container classes.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
diff --git a/lib/service/sfServiceContainerLoader.class.php b/lib/service/sfServiceContainerLoader.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@
  * sfServiceContainerLoader is the abstract class used by all built-in loaders.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfServiceContainerLoader.php 267 2009-03-26 19:56:18Z fabien $
  */
diff --git a/lib/service/sfServiceContainerLoaderArray.class.php b/lib/service/sfServiceContainerLoaderArray.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +14,7 @@
  * It does not include import functionnality.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Jerome Macias <jmacias@groupe-exp.com>
  */
 class sfServiceContainerLoaderArray extends sfServiceContainerLoader
diff --git a/lib/service/sfServiceContainerLoaderInterface.class.php b/lib/service/sfServiceContainerLoaderInterface.class.php
@@ -12,7 +12,7 @@
  * sfServiceContainerLoaderInterface is the interface implemented by service container loader classes.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
  */
diff --git a/lib/service/sfServiceDefinition.class.php b/lib/service/sfServiceDefinition.class.php
@@ -2,16 +2,17 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 /**
  * sfServiceDefinition represents a service definition.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfServiceDefinition.php 269 2009-03-26 20:39:16Z fabien $
  */
diff --git a/lib/service/sfServiceParameter.class.php b/lib/service/sfServiceParameter.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@
  * sfServiceParameter represents a parameter reference.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfServiceReference.php 267 2009-03-26 19:56:18Z fabien $
  */
diff --git a/lib/service/sfServiceReference.class.php b/lib/service/sfServiceReference.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@
  * sfServiceReference represents a service reference.
  *
  * @package    symfony
- * @subpackage dependency_injection
+ * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfServiceReference.php 267 2009-03-26 19:56:18Z fabien $
  */
diff --git a/lib/yaml/sfYaml.class.php b/lib/yaml/sfYaml.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -95,8 +95,6 @@ public static function load($input, $encoding = 'UTF-8')
       $mbConvertEncoding = true;
     }
 
-    require_once dirname(__FILE__).'/sfYamlParser.php';
-
     $yaml = new sfYamlParser();
 
     try
@@ -129,8 +127,6 @@ public static function load($input, $encoding = 'UTF-8')
    */
   public static function dump($array, $inline = 2)
   {
-    require_once dirname(__FILE__).'/sfYamlDumper.php';
-
     $yaml = new sfYamlDumper();
 
     return $yaml->dump($array, $inline);
@@ -169,13 +165,3 @@ protected static function arrayConvertEncoding(array $result, $encoding)
     return $convertedResult;
   }
 }
-
-/**
- * Wraps echo to automatically provide a newline.
- *
- * @param string $string The string to echo with new line
- */
-function echoln($string)
-{
-  echo $string."\n";
-}
diff --git a/lib/yaml/sfYamlDumper.class.php b/lib/yaml/sfYamlDumper.class.php
@@ -8,8 +8,6 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfYamlInline.php');
-
 /**
  * sfYamlDumper dumps PHP variables to YAML strings.
  *
diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
@@ -8,8 +8,6 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/sfYaml.php';
-
 /**
  * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
  *
diff --git a/lib/yaml/sfYamlParser.class.php b/lib/yaml/sfYamlParser.class.php
@@ -8,8 +8,6 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfYamlInline.php');
-
 if (!defined('PREG_BAD_UTF8_OFFSET_ERROR'))
 {
   define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
diff --git a/test/unit/event/sfEventDispatcherTest.php b/test/unit/event/sfEventDispatcherTest.php
@@ -8,10 +8,7 @@
  * file that was distributed with this source code.
  */
 
-$_test_dir = realpath(dirname(__FILE__).'/../..');
-require_once($_test_dir.'/../lib/vendor/lime/lime.php');
-require_once($_test_dir.'/../lib/event_dispatcher/sfEvent.php');
-require_once($_test_dir.'/../lib/event_dispatcher/sfEventDispatcher.php');
+require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
 
 $t = new lime_test(19);
 
diff --git a/test/unit/event/sfEventTest.php b/test/unit/event/sfEventTest.php
diff --git a/test/unit/yaml/sfYamlDumperTest.php b/test/unit/yaml/sfYamlDumperTest.php
diff --git a/test/unit/yaml/sfYamlInlineTest.php b/test/unit/yaml/sfYamlInlineTest.php
diff --git a/test/unit/yaml/sfYamlParserTest.php b/test/unit/yaml/sfYamlParserTest.php
