Skip to content

Commit

Permalink
Merge branch '2.2' into 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
glye committed Nov 21, 2018
2 parents 924396f + 6a66aaf commit 8699736
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions bin/console
Expand Up @@ -12,6 +12,11 @@ use Symfony\Component\Debug\Debug;

set_time_limit(0);

// Disable the PHAR stream wrapper as it is insecure
if (in_array('phar', stream_get_wrappers())) {
stream_wrapper_unregister('phar');
}

// Ensure UTF-8 is used in string operations
setlocale(LC_CTYPE, 'C.UTF-8');

Expand Down
5 changes: 5 additions & 0 deletions web/app.php
Expand Up @@ -3,6 +3,11 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Debug\Debug;

// Disable the PHAR stream wrapper as it is insecure
if (in_array('phar', stream_get_wrappers())) {
stream_wrapper_unregister('phar');
}

// Ensure UTF-8 is used in string operations
setlocale(LC_CTYPE, 'C.UTF-8');
require __DIR__ . '/../vendor/autoload.php';
Expand Down

0 comments on commit 8699736

Please sign in to comment.