Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump slim/slim from 3.9.0 to 3.11.0 #53

Merged
merged 2 commits into from
Nov 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions Tools/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,17 @@

$containerBuilder = new ContainerBuilder;
$containerBuilder->addDefinitions(ROOT_PATH . 'di-config.php');
$container = $containerBuilder->build();
$app = new \Slim\App($container);

/*
* Commençons simple et posons le paramétrage des assert ici.
* Précision : une partie est faite côté php.ini (nouvelle norme)
*/
$stage = $container->get('environment')->get('stage');
if ('development' == $stage) {
ini_set('assert.exception', '1');
error_reporting(-1);
ini_set("display_errors", '1');
$configuration = $container->get('configuration');
if (!empty($configuration['logger_token'])) {
Rollbar::init([
'access_token' => $configuration['logger_token'],
'environment' => $stage,
'use_error_reporting' => true,
'allow_exec' => false,
'included_errno' => E_ALL,
]);
\Rollbar\Rollbar::addCustom('access_key', $configuration['logger_token']);
}
} else {
assert_options(ASSERT_ACTIVE, 0);
ini_set('assert.exception', '0');
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
ini_set("display_errors", '0');
}
$app = new \Slim\App($containerBuilder->build());

/*
* /!\ Les Middlewares sont executés en mode PILE : le premier de la liste est lancé en dernier
*/
$app->add(new Middlewares\AccessChecker($app));
$app->add(new Middlewares\Identificator($app));
$app->add(new Middlewares\DBConnector($app));
$app->add(new Middlewares\ConfigurationFileChecker($app));
$app->add(new Middlewares\ResourceFormatter($app));
$app->add(new Middlewares\HeadersChecker($app));
$app->add(new Middlewares\ConfigurationFileChecker($app));

$app->get('/hello_world', function(IRequest $request, IResponse $response) {
return $response->withJson('Hi there !');
Expand Down
55 changes: 55 additions & 0 deletions Tools/Middlewares/EnvironmentDefiner.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php declare(strict_types = 1);
namespace LibertAPI\Tools\Middlewares;

use Psr\Http\Message\ServerRequestInterface as IRequest;
use Psr\Http\Message\ResponseInterface as IResponse;
use \Rollbar\Rollbar;

/**
* Définit toutes les particularités d'environnement
*
* @since 1.5
*/
final class EnvironmentDefiner extends \LibertAPI\Tools\AMiddleware
{
public function __invoke(IRequest $request, IResponse $response, callable $next) : IResponse
{
$configuration = $this->getContainer()->get('configurationFileData');
$stage = (!isset($configuration['stage']) || 'development' !== $configuration['stage'])
? 'production'
: 'development';
if ('development' == $stage) {
$this->defineDevelopment();
} else {
$this->defineProduction();
}

return $next($request, $response);
}

private function defineDevelopment()
{
ini_set('assert.exception', '1');
error_reporting(-1);
ini_set("display_errors", '1');
$configuration = $this->getContainer()->get('configurationFileData');
if (!empty($configuration['logger_token'])) {
Rollbar::init([
'access_token' => $configuration['logger_token'],
'environment' => $stage,
'use_error_reporting' => true,
'allow_exec' => false,
'included_errno' => E_ALL,
]);
\Rollbar\Rollbar::addCustom('access_key', $configuration['logger_token']);
}
}

private function defineProduction()
{
assert_options(ASSERT_ACTIVE, 0);
ini_set('assert.exception', '0');
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
ini_set("display_errors", '0');
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"require": {
"php": "^7.1",
"slim/slim": "3.9",
"slim/slim": "3.11.0",
"doctrine/dbal": "2.5",
"php-di/php-di": "6.0.5",
"adldap2/adldap2": "9.1",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions di-config.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,7 @@ function configurationGenerale()
Slim\Router::class => get('router'),
'callableResolver' => autowire(CallableResolver::class),
'environment' => function (C $c) {
$configuration = $c->get('configuration');
$stage = (!isset($configuration['stage']) || 'development' !== $configuration['stage'])
? 'production'
: 'development';

$e = new Slim\Http\Environment($_SERVER);
$e->set('stage', $stage);

return $e;
},
'configuration' => function (C $c) {
return json_decode(file_get_contents(ROOT_PATH . 'configuration.json'), true);
return new Slim\Http\Environment($_SERVER);
},
'request' => function (C $c) {
return Request::createFromEnvironment($c->get('environment'));
Expand Down