@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | $handle = @fopen($config_path, 'r'); |
| 17 | 17 | if ($handle === false) { |
| 18 | - throw new RuntimeException("Could not load config"); |
|
| 18 | + throw new RuntimeException("Could not load config"); |
|
| 19 | 19 | } |
| 20 | 20 | $config = fread($handle, filesize($config_path)); |
| 21 | 21 | fclose($handle); |
@@ -23,71 +23,71 @@ discard block |
||
| 23 | 23 | $config = json_decode($config); |
| 24 | 24 | $last_json_error = json_last_error(); |
| 25 | 25 | if ($last_json_error !== JSON_ERROR_NONE) { |
| 26 | - throw new RuntimeException("Could not parse config - JSON error detected"); |
|
| 26 | + throw new RuntimeException("Could not parse config - JSON error detected"); |
|
| 27 | 27 | } |
| 28 | 28 | $container['config'] = $config; |
| 29 | 29 | |
| 30 | 30 | // timezones are fun |
| 31 | 31 | date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration |
| 32 | 32 | $container['default_timezone'] = function ($c) { |
| 33 | - return new DateTimeZone('America/Phoenix'); |
|
| 33 | + return new DateTimeZone('America/Phoenix'); |
|
| 34 | 34 | }; |
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | // configure the db connections holder |
| 38 | 38 | $db_connections = new Aura\Sql\ConnectionLocator(); |
| 39 | 39 | $db_connections->setDefault(function () use ($config) { |
| 40 | - $connection = $config->database->slave; |
|
| 41 | - return new Aura\Sql\ExtendedPdo( |
|
| 42 | - "mysql:host={$connection->host}", |
|
| 43 | - $connection->user, |
|
| 44 | - $connection->password |
|
| 45 | - ); |
|
| 40 | + $connection = $config->database->slave; |
|
| 41 | + return new Aura\Sql\ExtendedPdo( |
|
| 42 | + "mysql:host={$connection->host}", |
|
| 43 | + $connection->user, |
|
| 44 | + $connection->password |
|
| 45 | + ); |
|
| 46 | 46 | }); |
| 47 | 47 | $db_connections->setWrite('master', function () use ($config) { |
| 48 | - $connection = $config->database->master; |
|
| 49 | - return new Aura\Sql\ExtendedPdo( |
|
| 50 | - "mysql:host={$connection->host}", |
|
| 51 | - $connection->user, |
|
| 52 | - $connection->password |
|
| 53 | - ); |
|
| 48 | + $connection = $config->database->master; |
|
| 49 | + return new Aura\Sql\ExtendedPdo( |
|
| 50 | + "mysql:host={$connection->host}", |
|
| 51 | + $connection->user, |
|
| 52 | + $connection->password |
|
| 53 | + ); |
|
| 54 | 54 | }); |
| 55 | 55 | $db_connections->setRead('slave', function () use ($config) { |
| 56 | - $connection = $config->database->slave; |
|
| 57 | - $pdo = new Aura\Sql\ExtendedPdo( |
|
| 58 | - "mysql:host={$connection->host}", |
|
| 59 | - $connection->user, |
|
| 60 | - $connection->password |
|
| 61 | - ); |
|
| 62 | - |
|
| 63 | - $profiler = new Aura\Sql\Profiler(); |
|
| 64 | - $profiler->setActive(true); |
|
| 65 | - $pdo->setProfiler($profiler); |
|
| 66 | - |
|
| 67 | - return $pdo; |
|
| 56 | + $connection = $config->database->slave; |
|
| 57 | + $pdo = new Aura\Sql\ExtendedPdo( |
|
| 58 | + "mysql:host={$connection->host}", |
|
| 59 | + $connection->user, |
|
| 60 | + $connection->password |
|
| 61 | + ); |
|
| 62 | + |
|
| 63 | + $profiler = new Aura\Sql\Profiler(); |
|
| 64 | + $profiler->setActive(true); |
|
| 65 | + $pdo->setProfiler($profiler); |
|
| 66 | + |
|
| 67 | + return $pdo; |
|
| 68 | 68 | }); |
| 69 | 69 | $container['db_connection_locator'] = $db_connections; |
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | // setup mail handler |
| 73 | 73 | $container['mail'] = $container->factory(function ($c) { |
| 74 | - return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']); |
|
| 74 | + return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']); |
|
| 75 | 75 | }); |
| 76 | 76 | |
| 77 | 77 | |
| 78 | 78 | // setup the logger |
| 79 | 79 | $container['setup_logger'] = $container->protect(function ($name) use ($container) { |
| 80 | - $logger = new Monolog\Logger($name); |
|
| 80 | + $logger = new Monolog\Logger($name); |
|
| 81 | 81 | |
| 82 | - $logPath = __DIR__ . "/../logs/{$name}.log"; |
|
| 83 | - $streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO); |
|
| 84 | - $streamHandler->setFormatter( |
|
| 85 | - new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n") |
|
| 86 | - ); |
|
| 87 | - $logger->pushHandler($streamHandler); |
|
| 82 | + $logPath = __DIR__ . "/../logs/{$name}.log"; |
|
| 83 | + $streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO); |
|
| 84 | + $streamHandler->setFormatter( |
|
| 85 | + new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n") |
|
| 86 | + ); |
|
| 87 | + $logger->pushHandler($streamHandler); |
|
| 88 | 88 | |
| 89 | - Monolog\ErrorHandler::register($logger); |
|
| 90 | - $container['logger'] = $logger; |
|
| 89 | + Monolog\ErrorHandler::register($logger); |
|
| 90 | + $container['logger'] = $logger; |
|
| 91 | 91 | }); |
| 92 | 92 | |
| 93 | 93 | |
@@ -108,30 +108,30 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | // sets up shutdown function to display profiler |
| 110 | 110 | register_shutdown_function(function () use ($container) { |
| 111 | - if ( |
|
| 112 | - !isset($_COOKIE['debugger']) || |
|
| 113 | - $_COOKIE['debugger'] != 'display' |
|
| 114 | - ) { |
|
| 115 | - return; |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - $dbProfiles = $container['db_connection_locator'] |
|
| 119 | - ->getRead() |
|
| 120 | - ->getProfiler() |
|
| 121 | - ->getProfiles(); |
|
| 122 | - $dbProfiles = array_filter($dbProfiles, function ($profile) { |
|
| 123 | - return $profile['function'] == 'perform'; |
|
| 124 | - }); |
|
| 125 | - $dbProfiles = array_map(function ($profile) { |
|
| 126 | - return [ |
|
| 127 | - 'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])), |
|
| 128 | - 'parameters' => $profile['bind_values'], |
|
| 129 | - 'time' => $profile['duration'], |
|
| 130 | - ]; |
|
| 131 | - }, $dbProfiles); |
|
| 132 | - $container['profiler']->setProfiledQueries($dbProfiles); |
|
| 133 | - $container['profiler']->setDisplay(new Particletree\Pqp\Display()); |
|
| 134 | - $container['profiler']->display($container['db_connection_locator']->getRead()); |
|
| 111 | + if ( |
|
| 112 | + !isset($_COOKIE['debugger']) || |
|
| 113 | + $_COOKIE['debugger'] != 'display' |
|
| 114 | + ) { |
|
| 115 | + return; |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + $dbProfiles = $container['db_connection_locator'] |
|
| 119 | + ->getRead() |
|
| 120 | + ->getProfiler() |
|
| 121 | + ->getProfiles(); |
|
| 122 | + $dbProfiles = array_filter($dbProfiles, function ($profile) { |
|
| 123 | + return $profile['function'] == 'perform'; |
|
| 124 | + }); |
|
| 125 | + $dbProfiles = array_map(function ($profile) { |
|
| 126 | + return [ |
|
| 127 | + 'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])), |
|
| 128 | + 'parameters' => $profile['bind_values'], |
|
| 129 | + 'time' => $profile['duration'], |
|
| 130 | + ]; |
|
| 131 | + }, $dbProfiles); |
|
| 132 | + $container['profiler']->setProfiledQueries($dbProfiles); |
|
| 133 | + $container['profiler']->setDisplay(new Particletree\Pqp\Display()); |
|
| 134 | + $container['profiler']->display($container['db_connection_locator']->getRead()); |
|
| 135 | 135 | }); |
| 136 | 136 | |
| 137 | 137 | $container['console']->logMemory(null, 'PHP - Post-boostrap memory'); |
@@ -29,14 +29,14 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | // timezones are fun |
| 31 | 31 | date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration |
| 32 | -$container['default_timezone'] = function ($c) { |
|
| 32 | +$container['default_timezone'] = function($c) { |
|
| 33 | 33 | return new DateTimeZone('America/Phoenix'); |
| 34 | 34 | }; |
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | // configure the db connections holder |
| 38 | 38 | $db_connections = new Aura\Sql\ConnectionLocator(); |
| 39 | -$db_connections->setDefault(function () use ($config) { |
|
| 39 | +$db_connections->setDefault(function() use ($config) { |
|
| 40 | 40 | $connection = $config->database->slave; |
| 41 | 41 | return new Aura\Sql\ExtendedPdo( |
| 42 | 42 | "mysql:host={$connection->host}", |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | $connection->password |
| 45 | 45 | ); |
| 46 | 46 | }); |
| 47 | -$db_connections->setWrite('master', function () use ($config) { |
|
| 47 | +$db_connections->setWrite('master', function() use ($config) { |
|
| 48 | 48 | $connection = $config->database->master; |
| 49 | 49 | return new Aura\Sql\ExtendedPdo( |
| 50 | 50 | "mysql:host={$connection->host}", |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $connection->password |
| 53 | 53 | ); |
| 54 | 54 | }); |
| 55 | -$db_connections->setRead('slave', function () use ($config) { |
|
| 55 | +$db_connections->setRead('slave', function() use ($config) { |
|
| 56 | 56 | $connection = $config->database->slave; |
| 57 | 57 | $pdo = new Aura\Sql\ExtendedPdo( |
| 58 | 58 | "mysql:host={$connection->host}", |
@@ -70,13 +70,13 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | // setup mail handler |
| 73 | -$container['mail'] = $container->factory(function ($c) { |
|
| 73 | +$container['mail'] = $container->factory(function($c) { |
|
| 74 | 74 | return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']); |
| 75 | 75 | }); |
| 76 | 76 | |
| 77 | 77 | |
| 78 | 78 | // setup the logger |
| 79 | -$container['setup_logger'] = $container->protect(function ($name) use ($container) { |
|
| 79 | +$container['setup_logger'] = $container->protect(function($name) use ($container) { |
|
| 80 | 80 | $logger = new Monolog\Logger($name); |
| 81 | 81 | |
| 82 | 82 | $logPath = __DIR__ . "/../logs/{$name}.log"; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | |
| 109 | 109 | // sets up shutdown function to display profiler |
| 110 | -register_shutdown_function(function () use ($container) { |
|
| 110 | +register_shutdown_function(function() use ($container) { |
|
| 111 | 111 | if ( |
| 112 | 112 | !isset($_COOKIE['debugger']) || |
| 113 | 113 | $_COOKIE['debugger'] != 'display' |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | ->getRead() |
| 120 | 120 | ->getProfiler() |
| 121 | 121 | ->getProfiles(); |
| 122 | - $dbProfiles = array_filter($dbProfiles, function ($profile) { |
|
| 122 | + $dbProfiles = array_filter($dbProfiles, function($profile) { |
|
| 123 | 123 | return $profile['function'] == 'perform'; |
| 124 | 124 | }); |
| 125 | - $dbProfiles = array_map(function ($profile) { |
|
| 125 | + $dbProfiles = array_map(function($profile) { |
|
| 126 | 126 | return [ |
| 127 | 127 | 'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])), |
| 128 | 128 | 'parameters' => $profile['bind_values'], |