Changeset 2005

Timestamp:

02/09/2008 12:07:53 AM (11 months ago)

Author:

PugFish

Message:

Replaced all instances of loading using the now removed Loader library.
Removed missed line that instances Loader.

Location:

trunk

Files:

• application/controllers/examples.php (modified) (14 diffs)
• index.php (modified) (1 diff)
• modules/media/controllers/media.php (modified) (1 diff)
• system/libraries/Controller.php (modified) (2 diffs)
• system/libraries/ORM.php (modified) (1 diff)

trunk/application/controllers/examples.php

@@ -73 +73 @@
                 );
 
-                $view = $this->load->view('viewinview/container', $data);
-                $view->header = $this->load->view('viewinview/header', $data);
+                $view = new View('viewinview/container', $data);
+                $view->header = new View('viewinview/header', $data);
 
                 $view->render(TRUE);
@@ -98 +98 @@
         function session()
         {
-                $s = new Session();
+                // Gets the singleton instance of the Session library
+                $s = Session::instance();
 
                 echo 'SESSID: <pre>'.session_id()."</pre>\n";
@@ -112 +113 @@
         function form()
         {
-                $this->load->library('validation');
+                $validation = new Validation;
 
                 echo form::open('', array('enctype' => 'multipart/form-data'));
@@ -126 +127 @@
                 if ( ! empty($_POST))
                 {
-                        $this->validation->set_rules('imageup', 'required|upload[gif,png,jpg,500K]', 'Image Upload');
-                        echo '<p>validation result: '.var_export($this->validation->run(), TRUE).'</p>';
-                }
-
-                echo Kohana::debug($this->validation);
+                        $validation->set_rules('imageup', 'required|upload[gif,png,jpg,500K]', 'Image Upload');
+                        echo '<p>validation result: '.var_export($validation->run(), TRUE).'</p>';
+                }
+
+                echo Kohana::debug($validation);
                 echo Kohana::lang('core.stats_footer');
         }
@@ -149 +150 @@
                 );
 
-                // Same as CI, but supports passing an array to the constructor
-                $this->load->library('validation', $data);
+                $validation = new Validation($data);
 
                 // Looks familiar...
-                $this->validation->set_rules(array
+                $validation->set_rules(array
                 (
                         // Format:
@@ -163 +163 @@
 
                 // Same syntax as before
-                $this->validation->run();
+                $validation->run();
 
                 // Same syntax, but dynamcially generated wth __get()
-                echo $this->validation->error_string;
+                echo $validation->error_string;
 
                 // Yay!
@@ -193 +193 @@
         function database()
         {
-                $this->load->database();
+                $db = new Database;
+                
                 $table = 'pages';
                 echo 'Does the '.$table.' table exist? ';
-                if ($this->db->table_exists($table))
+                if ($db->table_exists($table))
                 {
                         echo '<p>YES! Lets do some work =)</p>';
 
-                        $query = $this->db->select('DISTINCT pages.*')->from($table)->get();
-                        echo $this->db->last_query();
+                        $query = $db->select('DISTINCT pages.*')->from($table)->get();
+                        echo $db->last_query();
                         echo '<h3>Iterate through the result:</h3>';
                         foreach($query as $item)
@@ -208 +209 @@
                         }
                         echo '<h3>Numrows using count(): '.count($query).'</h3>';
-                        echo 'Table Listing:<pre>'.print_r($this->db->list_tables(), TRUE).'</pre>';
+                        echo 'Table Listing:<pre>'.print_r($db->list_tables(), TRUE).'</pre>';
 
                         echo '<h3>Try Query Binding with objects:</h3>';
                         $sql = 'SELECT * FROM '.$table.' WHERE id = ?';
-                        $query = $this->db->query($sql, array(1));
-                        echo '<p>'.$this->db->last_query().'</p>';
+                        $query = $db->query($sql, array(1));
+                        echo '<p>'.$db->last_query().'</p>';
                         $query->result(TRUE);
                         foreach($query as $item)
@@ -222 +223 @@
                         echo '<h3>Try Query Binding with arrays (returns both associative and numeric because I pass MYSQL_BOTH to result():</h3>';
                         $sql = 'SELECT * FROM '.$table.' WHERE id = ?';
-                        $query = $this->db->query($sql, array(1));
-                        echo '<p>'.$this->db->last_query().'</p>';
+                        $query = $db->query($sql, array(1));
+                        echo '<p>'.$db->last_query().'</p>';
                         $query->result(FALSE, MYSQL_BOTH);
                         foreach($query as $item)
@@ -231 +232 @@
 
                         echo '<h3>Look, we can also manually advance the result pointer!</h3>';
-                        $query = $this->db->select('title')->from($table)->get();
+                        $query = $db->select('title')->from($table)->get();
                         echo 'First:<pre>'.print_r($query->current(), true).'</pre><br />';
                         $query->next();
@@ -241 +242 @@
                         echo 'Rewound:<pre>'.print_r($query->current(), true).'</pre>';
 
-                        echo '<p>Number of rows using count_records(): '.$this->db->count_records('pages').'</p>';
+                        echo '<p>Number of rows using count_records(): '.$db->count_records('pages').'</p>';
                 }
                 else
@@ -256 +257 @@
         function pagination()
         {
-                $this->pagination = new Pagination(array(
+                $pagination = new Pagination(array(
                         // 'base_url'    => 'welcome/pagination_example/page/', // base_url will default to current uri
                         'uri_segment'    => 'page', // pass a string as uri_segment to trigger former 'label' functionality
@@ -265 +266 @@
 
                 // Just echoing it is enough to display the links (__toString() rocks!)
-                echo 'Classic style: '.$this->pagination;
+                echo 'Classic style: '.$pagination;
 
                 // You can also use the create_links() method and pick a style on the fly if you want
-                echo '<hr />Digg style:     '.$this->pagination->create_links('digg');
-                echo '<hr />Extended style: '.$this->pagination->create_links('extended');
-                echo '<hr />PunBB style:    '.$this->pagination->create_links('punbb');
+                echo '<hr />Digg style:     '.$pagination->create_links('digg');
+                echo '<hr />Extended style: '.$pagination->create_links('extended');
+                echo '<hr />PunBB style:    '.$pagination->create_links('punbb');
                 echo 'done in {execution_time} seconds';
         }
@@ -279 +280 @@
         function user_agent()
         {
-                $this->load->library('user_agent');
+                $ua = new User_agent;
 
                 foreach(array('agent', 'browser', 'version') as $key)
                 {
-                        echo $key.': '.$this->user_agent->$key.'<br/>'."\n";
+                        echo $key.': '.$ua->$key.'<br/>'."\n";
                 }
 

trunk/index.php

@@ -7 +7 @@
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007 Kohana Team
+ * @copyright  (c) 2007-2008 Kohana Team
  * @license    http://kohanaphp.com/license.html
  */

trunk/modules/media/controllers/media.php

@@ -43 +43 @@
                 if ($this->use_cache AND ! isset($this->cache)) 
                 {
-                        $this->load->library('cache');
+                        $this->cache = new Cache;
                 }
 

trunk/system/libraries/Controller.php

@@ -24 +24 @@
                         Kohana::$instance = $this;
 
-                        // Loader should always be available
+                        // URI should always be available
                         $this->uri = new URI;
 
@@ -32 +32 @@
                 else
                 {
-                        // Loader should always be available
-                        $this->load = Kohana::$instance->load;
-
-                        // Loader should always be available
+                        // URI should always be available
                         $this->uri = Kohana::$instance->uri;
 

trunk/system/libraries/ORM.php

@@ -726 +726 @@
                 {
                         // Load database, if not already loaded
-                        isset(Kohana::instance()->db) or Kohana::instance()->load->database();
+                        isset(Kohana::instance()->db) or Kohana::instance()->db = Database::instance();
 
                         // Insert db into this object