foreveralone Commit Details

Date:

2016-02-27 14:32:11 (9 years 8 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

c3ae3a73b629e1dc889ef2fae84624d25c1c91a0

Parents:

5b61d873fd2c9fc0e871627ecbd9ed3a4c8416bc

Message:

Some cleanup and commenting out ParseError in h2o because ParseError is now an exception in PHP

Changes:

File differences

-25
26 26
27 27
28 
29 
30 
31 
32 28
+␉␉\vendor\DB\DB::query("DELETE FROM users");␊
␉␉\vendor\DB\DB::query("DELETE FROM sessions");␊
␉␉break;␊
␉case "adduser":␊
␉␉$user = $argv[2];␊
␉␉\vendor\DB\DB::query("INSERT INTO users VALUES (null, ?)", [$user]);␊
␉␉break;␊
}␊
 ␉␉\vendor\DB\DB::query("DELETE FROM users");␊
 ␉␉\vendor\DB\DB::query("DELETE FROM sessions");␊
 ␉␉break;␊
-␉case "adduser":␊
-␉␉$user = $argv[2];␊
-␉␉\vendor\DB\DB::query("INSERT INTO users VALUES (null, ?)", [$user]);␊
-␉␉break;␊
 }␊

-1
2 2
3 
4 
5 
6 
7 
8 3
9 4
10 5
... ...
313 308
314 309
315 310
311
312
313
314
316 315
317 316
318 317
+<?php␊
␊
/*include "system/engine/hf_controller.php";␊
include "system/engine/smtp.php";␊
include "system/engine/exceptions.php";␊
include "system/engine/hf_model.php";*/␊
␊
namespace system\engine;␊
␊
use vendor\DB\DB;␊

␉␉␉␉␉␉␉  migration INTEGER,␊
␉␉␉␉␉␉␉  ran_at DATETIME␊
␉␉␉␉)");␊
␉␉if (count($argv) < 2) {␊
␉␉␉echo "options = show, count, run, clear, reset";␊
␉␉␉return;␊
␉␉}␊
        switch ($argv[1]) {␊
            case "show":␊
                foreach(DB::fetch("SELECT migration, ran_at FROM migrations") as $migration) {␊
 ...
 <?php␊
 ␊
-/*include "system/engine/hf_controller.php";␊
-include "system/engine/smtp.php";␊
-include "system/engine/exceptions.php";␊
-include "system/engine/hf_model.php";*/␊
-␊
 namespace system\engine;␊
 ␊
 use vendor\DB\DB;␊
 ␉␉␉␉␉␉␉  migration INTEGER,␊
 ␉␉␉␉␉␉␉  ran_at DATETIME␊
 ␉␉␉␉)");␊
+␉␉if (count($argv) < 2) {␊
+␉␉␉echo "options = show, count, run, clear, reset";␊
+␉␉␉return;␊
+␉␉}␊
         switch ($argv[1]) {␊
             case "show":␊
                 foreach(DB::fetch("SELECT migration, ran_at FROM migrations") as $migration) {␊

-3
4 4
5 5
6 
6
7
8
9
7 10
8 11
9 12
+␊
#␉Errors␊
class H2o_Error extends Exception {}␊
class ParseError extends H2o_Error {}␊
// PHP now has an exception called ParseError␊
// but h2o doesn't seem like it uses it so I am commenting it out␊
// for a future removal␊
//class ParseError extends H2o_Error {}␊
class TemplateNotFound extends H2o_Error {}␊
class TemplateSyntaxError extends H2o_Error {}␊
␊
 ␊
 #␉Errors␊
 class H2o_Error extends Exception {}␊
-class ParseError extends H2o_Error {}␊
+// PHP now has an exception called ParseError␊
+// but h2o doesn't seem like it uses it so I am commenting it out␊
+// for a future removal␊
+//class ParseError extends H2o_Error {}␊
 class TemplateNotFound extends H2o_Error {}␊
 class TemplateSyntaxError extends H2o_Error {}␊
 ␊