[Solar-svn] Revision 2897

[pmjones at solarphp.com]

Solar_Auth, Cache, Role, Sql: [BRK] Deprecated 'config' key removed, factory classes now use $_config directly.




Modified: trunk/Solar/Auth.php
===================================================================
--- trunk/Solar/Auth.php	2007-10-18 23:32:42 UTC (rev 2896)
+++ trunk/Solar/Auth.php	2007-10-19 23:35:19 UTC (rev 2897)
@@ -56,14 +56,7 @@
         $class = $config['adapter'];
         unset($config['adapter']);
         
-        // deprecated: support a 'config' key for the adapter configs.
-        // this was needed for facades, but is not needed for factories.
-        if (isset($config['config'])) {
-            $tmp = $config['config'];
-            unset($config['config']);
-            $config = array_merge($config, (array) $tmp);
-        }
-        
+        // return the factoried adapter object
         return Solar::factory($class, $config);
     }
 }

Modified: trunk/Solar/Cache.php
===================================================================
--- trunk/Solar/Cache.php	2007-10-18 23:32:42 UTC (rev 2896)
+++ trunk/Solar/Cache.php	2007-10-19 23:35:19 UTC (rev 2897)
@@ -57,14 +57,7 @@
         $class = $config['adapter'];
         unset($config['adapter']);
         
-        // deprecated: support a 'config' key for the adapter configs.
-        // this was needed for facades, but is not needed for factories.
-        if (isset($config['config'])) {
-            $tmp = $config['config'];
-            unset($config['config']);
-            $config = array_merge($config, (array) $tmp);
-        }
-        
+        // return the factoried adapter object
         return Solar::factory($class, $config);
     }
 }

Modified: trunk/Solar/Role.php
===================================================================
--- trunk/Solar/Role.php	2007-10-18 23:32:42 UTC (rev 2896)
+++ trunk/Solar/Role.php	2007-10-19 23:35:19 UTC (rev 2897)
@@ -56,14 +56,7 @@
         $class = $config['adapter'];
         unset($config['adapter']);
         
-        // deprecated: support a 'config' key for the adapter configs.
-        // this was needed for facades, but is not needed for factories.
-        if (isset($config['config'])) {
-            $tmp = $config['config'];
-            unset($config['config']);
-            $config = array_merge($config, (array) $tmp);
-        }
-        
+        // return the factoried adapter object
         return Solar::factory($class, $config);
     }
 }

Modified: trunk/Solar/Sql.php
===================================================================
--- trunk/Solar/Sql.php	2007-10-18 23:32:42 UTC (rev 2896)
+++ trunk/Solar/Sql.php	2007-10-19 23:35:19 UTC (rev 2897)
@@ -56,14 +56,7 @@
         $class = $config['adapter'];
         unset($config['adapter']);
         
-        // deprecated: support a 'config' key for the adapter configs.
-        // this was needed for facades, but is not needed for factories.
-        if (isset($config['config'])) {
-            $tmp = $config['config'];
-            unset($config['config']);
-            $config = array_merge($config, (array) $tmp);
-        }
-        
+        // return the factoried adapter object
         return Solar::factory($class, $config);
     }
 }