Removing some dead code��:wq

Author: weaverryan

_tuts/pimple-dic.diff

@@ -78,30 +78,31 @@ index aee9a74..9642f7c 100644
              "version": "v2.5.6",
              "target-dir": "Symfony/Component/HttpFoundation",
 diff --git a/index.php b/index.php
-index d8c644d..7c5d9af 100644
+index d8c644d..646ee16 100644
 --- a/index.php
 +++ b/index.php
-@@ -12,30 +12,52 @@ try {
+@@ -1,41 +1,56 @@
+ <?php
+ require __DIR__.'/bootstrap.php';
+ 
+-try {
+-    $dbPath = __DIR__.'/data/database.sqlite';
+-    $dbh = new PDO('sqlite:'.$dbPath);
+-} catch(PDOException $e) {
+-    die('Panic! '.$e->getMessage());
+-}
+-
+ // create a request object to help us
  use Symfony\Component\HttpFoundation\Request;
  use Symfony\Component\HttpFoundation\Response;
  use Aura\Router\RouterFactory;
 +use Pimple\Container;
- 
--$request = Request::createFromGlobals();
--$uri = $request->getPathInfo();
++
 +$c = new Container();
- 
--$routerFactory = new RouterFactory();
--$router = $routerFactory->newInstance();
++
 +// configuration
 +$c['connection_string'] = 'sqlite:'.__DIR__.'/data/database.sqlite';
- 
--// create a router, build the routes, and then execute it
--$router->add('attendees_list', '/attendees')
--    ->addValues(['controller' => 'attendees_controller']);
--$router->add('homepage', '{/name}')
--    ->addValues(['controller' => 'homepage_controller']);
--$route = $router->match($uri, $request->server->all());
++
 +// Service setup
 +$c['connection'] = function(Container $c) {
 +    return new PDO($c['connection_string']);
@@ -115,16 +116,26 @@ index d8c644d..7c5d9af 100644
 +    $routerFactory = new RouterFactory();
 +
 +    $router = $routerFactory->newInstance();
-+
+ 
+-$request = Request::createFromGlobals();
+-$uri = $request->getPathInfo();
 +    // create a router, build the routes, and then execute it
 +    $router->add('attendees_list', '/attendees')
 +        ->addValues(['controller' => 'attendees_controller']);
 +    $router->add('homepage', '{/name}')
 +        ->addValues(['controller' => 'homepage_controller']);
-+
+ 
+-$routerFactory = new RouterFactory();
+-$router = $routerFactory->newInstance();
 +    return $router;
 +};
-+
+ 
+-// create a router, build the routes, and then execute it
+-$router->add('attendees_list', '/attendees')
+-    ->addValues(['controller' => 'attendees_controller']);
+-$router->add('homepage', '{/name}')
+-    ->addValues(['controller' => 'homepage_controller']);
+-$route = $router->match($uri, $request->server->all());
 +// run the framework!
 +$route = $c['router']->match(
 +    $c['request']->getPathInfo(),
@@ -147,7 +158,7 @@ index d8c644d..7c5d9af 100644
  if (!$response instanceof Response) {
      throw new Exception(sprintf('Your controller "%s" did not return a response!!', $controller));
  }
-@@ -56,8 +78,8 @@ function homepage_controller(Request $request) {
+@@ -56,8 +71,8 @@ function homepage_controller(Request $request) {
      return new Response($content);
  }
 

_tuts/reorganization.diff

@@ -147,20 +147,13 @@ index 0000000..9adb562
 +    return $response;
 +}
 diff --git a/index.php b/index.php
-index 5f42f7a..15a2099 100644
+index 919eee1..dd22794 100644
 --- a/index.php
 +++ b/index.php
-@@ -1,128 +1,7 @@
+@@ -1,121 +1,8 @@
  <?php
 -require __DIR__.'/bootstrap.php';
--
--try {
--    $dbPath = __DIR__.'/data/database.sqlite';
--    $dbh = new PDO('sqlite:'.$dbPath);
--} catch(PDOException $e) {
--    die('Panic! '.$e->getMessage());
--}
--
+ 
 -// create a request object to help us
 -use Symfony\Component\HttpFoundation\Request;
 -use Symfony\Component\HttpFoundation\Response;
@@ -233,8 +226,12 @@ index 5f42f7a..15a2099 100644
 -if (!$response instanceof Response) {
 -    throw new Exception(sprintf('Your controller "%s" did not return a response!!', $controller));
 -}
--
--$response->send();
++$c = require __DIR__.'/bootstrap.php';
++require 'routing.php';
++require 'controllers.php';
+ 
++$response = _run_app($c);
+ $response->send();
 -
 -/*
 - * My Controllers!
@@ -278,13 +275,7 @@ index 5f42f7a..15a2099 100644
 -
 -    return $response;
 -}
-+$c = require __DIR__.'/bootstrap.php';
-+require 'routing.php';
-+require 'controllers.php';
- 
-+$response = _run_app($c);
-+$response->send();
-\ No newline at end of file
+-
 diff --git a/routing.php b/routing.php
 new file mode 100644
 index 0000000..2b48429

_tuts/steps.json

@@ -31,5 +31,5 @@
             "description": null
         }
     ],
-    "sha": "bc624c5e8ca0fb8126e120712a21560498b7a882"
+    "sha": "e251e17cf10ac544e14cfa93d6ec4bceb05dcef9"
 }

_tuts/zf-logger.diff

@@ -198,10 +198,10 @@ index 9642f7c..5dfd2c3 100644
      ],
      "packages-dev": [],
 diff --git a/index.php b/index.php
-index 7c5d9af..5f42f7a 100644
+index 646ee16..919eee1 100644
 --- a/index.php
 +++ b/index.php
-@@ -13,11 +13,14 @@ use Symfony\Component\HttpFoundation\Request;
+@@ -6,11 +6,14 @@ use Symfony\Component\HttpFoundation\Request;
  use Symfony\Component\HttpFoundation\Response;
  use Aura\Router\RouterFactory;
  use Pimple\Container;
@@ -216,7 +216,7 @@ index 7c5d9af..5f42f7a 100644
 
  // Service setup
  $c['connection'] = function(Container $c) {
-@@ -41,6 +44,15 @@ $c['router'] = function() {
+@@ -34,6 +37,15 @@ $c['router'] = function() {
 
      return $router;
  };
@@ -232,7 +232,7 @@ index 7c5d9af..5f42f7a 100644
 
  // run the framework!
  $route = $c['router']->match(
-@@ -56,6 +68,13 @@ if ($route) {
+@@ -49,6 +61,13 @@ if ($route) {
  // get the "controller" out, or default to error404_controller
  $controller = $c['request']->attributes->get('controller', 'error404_controller');