Changeset 2899

Timestamp:

06/25/2008 03:04:09 AM (4 months ago)

Author:

armen

Message:

Removed extra called in foreaches.

Location:

trunk/system/libraries

Files:

• Calendar_Event.php (modified) (1 diff)
• Database.php (modified) (1 diff)
• ORM.php (modified) (4 diffs)
• Router.php (modified) (1 diff)
• Session.php (modified) (1 diff)
• URI.php (modified) (1 diff)
• Validation.php (modified) (1 diff)
• drivers/Cache/Memcache.php (modified) (1 diff)

trunk/system/libraries/Calendar_Event.php

@@ -240 +240 @@
                 }
 
-                foreach (array_diff_key($this->conditions, $tested) as $key => $value)
+                $conditions = array_diff_key($this->conditions, $tested);
+
+                foreach ($conditions as $key => $value)
                 {
                         if ($key === 'callback')

trunk/system/libraries/Database.php

@@ -369 +369 @@
                 }
 
-                foreach( (array) $table as $t)
+                foreach ((array) $table as $t)
                 {
                         $this->join['tables'][] = $this->driver->escape_column($this->config['table_prefix'].$t);

trunk/system/libraries/ORM.php

@@ -519 +519 @@
                         if ($action === 'add' AND is_array(current($args)))
                         {
-                                foreach (current($args) as $key => $val)
+                                $arg = current($args);
+
+                                foreach ($arg as $key => $val)
                                 {
                                         // Fill object with data from array
@@ -756 +758 @@
                 if ( ! $array->submitted())
                 {
-                        foreach ($array->safe_array() as $key => $val)
+                        $safe_array = $array->safe_array();
+                        
+                        foreach ($safe_array as $key => $val)
                         {
                                 // Pre-fill data
@@ -766 +770 @@
                 if ($status = $array->validate())
                 {
-                        foreach ($array->safe_array() as $key => $val)
+                        $safe_array = $array->safe_array();
+
+                        foreach ($safe_array as $key => $val)
                         {
                                 // Set new data
@@ -864 +870 @@
                                 }
 
-                                foreach (array_diff($new, $cur) as $key)
+                                $keys = array_diff($new, $cur);
+
+                                foreach ($keys as $key)
                                 {
                                         // Create new relationships

trunk/system/libraries/Router.php

@@ -94 +94 @@
 
                         $found = FALSE;
-                        foreach (Config::include_paths() as $dir)
+                        $paths = Config::include_paths();
+
+                        foreach ($paths as $dir)
                         {
                                 // Search within controllers only

trunk/system/libraries/Session.php

@@ -436 +436 @@
         public function delete($keys)
         {
-                foreach (func_get_args() as $key)
+                $args = func_get_args();
+
+                foreach ($args as $key)
                 {
                         if (isset(self::$protect[$key]))

trunk/system/libraries/URI.php

@@ -151 +151 @@
 
                 $associative = array();
-                foreach (array_chunk($array, 2) as $pair)
+                $pairs       = array_chunk($array, 2);
+
+                foreach ($pairs as $pair)
                 {
                         // Add the key/value pair to the associative array

trunk/system/libraries/Validation.php

@@ -622 +622 @@
                         {
                                 $messages = array();
-                                foreach (array_keys($this->messages) as $input)
+                                $keys     = array_keys($this->messages);
+
+                                foreach ($keys as $input)
                                 {
                                         $messages[] = $this->message($input);

trunk/system/libraries/drivers/Cache/Memcache.php

@@ -24 +24 @@
                 $this->flags = Config::item('cache_memcache.compression') ? MEMCACHE_COMPRESSED : 0;
 
-                foreach (Config::item('cache_memcache.servers') as $server)
+                $servers = Config::item('cache_memcache.servers');
+
+                foreach ($servers as $server)
                 {
                         // Make sure all required keys are set