Merge branch '1.5' into 1.6

Author: havvg

Tests/AutoloadAliasTest.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Propel\Bundle\PropelBundle\Tests;
+
+class AutoloadAliasTest extends \PHPUnit_Framework_TestCase
+{
+    public function testOldNamespaceWorks()
+    {
+        $inflector = new \Propel\PropelBundle\Util\PropelInflector();
+
+        static::assertInstanceOf('Propel\PropelBundle\Util\PropelInflector', $inflector);
+        static::assertInstanceOf('Propel\Bundle\PropelBundle\Util\PropelInflector', $inflector);
+    }
+}

autoload_aliases.php

@@ -0,0 +1,9 @@
+<?php
+
+function autoload_propel_aliases($className) {
+    if (0 === strpos($className, 'Propel\PropelBundle')) {
+        class_alias(str_replace('Propel\PropelBundle', 'Propel\Bundle\PropelBundle', $className), $className);
+    }
+}
+
+spl_autoload_register('autoload_propel_aliases', false, true);

composer.json

@@ -11,6 +11,7 @@
 
   "autoload": {
     "psr-4": { "Propel\\Bundle\\PropelBundle\\": "" },
+    "files": ["autoload_aliases.php"],
     "exclude-from-classmap": [ "Tests/" ]
   },