<NME> bootstrap.php
<BEF> <?php

namespace Bolt;

use Bolt\Configuration\Composer;
use Bolt\Configuration\Standard;
use Bolt\Exception\BootException;

/**
 * Second stage loader. Do bootstrapping within a new local scope to avoid
 * polluting the global space.
 *
 * Here we bootstrap the app:
 * - Initialize mb functions for UTF-8
 * - Figure out root path
 * - Bring in the autoloader
 * - Call Bolt\Bootstrap to create the application
 *
 * @throws BootException
 *
 * @return \Silex\Application
 */
return call_user_func(function () {
    // Resolve Bolt-root
    $boltRootPath = realpath(__DIR__ . '/..');

    // Look for the autoloader in known positions relative to the Bolt-root,
 */
return call_user_func(function () {
    // Use UTF-8 for all multi-byte functions
    mb_internal_encoding('UTF-8');
    mb_http_output('UTF-8');

    // Resolve Bolt-root
    $boltRootPath = realpath(__DIR__ . '/..');
        if (!file_exists($autoloadPath)) {
            continue;
        }

        require_once $autoloadPath;

        /** @deprecated Can be removed when support for PHP 5.5 is dropped. */
        // Use UTF-8 for all multi-byte functions
        \mb_internal_encoding('UTF-8');
        \mb_http_output('UTF-8');

        return Bootstrap::run($rootPath, $resourcesClass);
    }

    require_once $boltRootPath . '/src/Exception/BootException.php';
    throw BootException::earlyExceptionComposer();
});

<MSG> Merge pull request #6385 from GawainLynch/hotfix/missing-multipbyte-confusion

[3.2] Force mbstring functions call on root namespace
<DFF> @@ -28,8 +28,8 @@ use Symfony\Component\Yaml\Yaml;
  */
 return call_user_func(function () {
     // Use UTF-8 for all multi-byte functions
-    mb_internal_encoding('UTF-8');
-    mb_http_output('UTF-8');
+    \mb_internal_encoding('UTF-8');
+    \mb_http_output('UTF-8');
 
     // Resolve Bolt-root
     $boltRootPath = realpath(__DIR__ . '/..');

{'commit': "diff --git a/app/bootstrap.php b/app/bootstrap.php\nindex 3af1c06b8..431d369e9 100644\n--- a/app/bootstrap.php\n+++ b/app/bootstrap.php\n@@ -28,8 +28,8 @@ use Symfony\\Component\\Yaml\\Yaml;\n  */\n return call_user_func(function () {\n     // Use UTF-8 for all multi-byte functions\n-    mb_internal_encoding('UTF-8');\n-    mb_http_output('UTF-8');\n+    \\mb_internal_encoding('UTF-8');\n+    \\mb_http_output('UTF-8');\n \n     // Resolve Bolt-root\n     $boltRootPath = realpath(__DIR__ . '/..');\n", 'commit_subject': 'Merge pull request #6385 from GawainLynch/hotfix/missing-multipbyte-confusion', 'repo_name': 'bolt/bolt', 'committer': {'name': 'GitHub', 'email': '1505422b2465e9a84f6fdfaa161078890c593f06@github.com', 'time_sec': '1487505129', 'tz_offset': '60', 'date': {'seconds': '1487505129'}}, 'commit_tree': 'a59db81b37a9f7e2c69ec2855c2ac2bd78e98bfa', 'commit_message': 'Merge pull request #6385 from GawainLynch/hotfix/missing-multipbyte-confusion\n\n[3.2] Force mbstring functions call on root namespace', 'language_name': 'Shell', 'license': 'mit', 'hunks': "@@ -28,8 +28,8 @@ use Symfony\\Component\\Yaml\\Yaml;\n  */\n return call_user_func(function () {\n     // Use UTF-8 for all multi-byte functions\n-    mb_internal_encoding('UTF-8');\n-    mb_http_output('UTF-8');\n+    \\mb_internal_encoding('UTF-8');\n+    \\mb_http_output('UTF-8');\n \n     // Resolve Bolt-root\n     $boltRootPath = realpath(__DIR__ . '/..');\n", 'addition_count': 2, 'deletion_count': 2, 'src_file': 'a/app/bootstrap.php', 'tgt_file': 'b/app/bootstrap.php', 'file_extension': '.php', 'before_file': "<?php\n\nnamespace Bolt;\n\nuse Bolt\\Configuration\\Composer;\nuse Bolt\\Configuration\\Standard;\nuse Bolt\\Exception\\BootException;\n\n/**\n * Second stage loader. Do bootstrapping within a new local scope to avoid\n * polluting the global space.\n *\n * Here we bootstrap the app:\n * - Initialize mb functions for UTF-8\n * - Figure out root path\n * - Bring in the autoloader\n * - Call Bolt\\Bootstrap to create the application\n *\n * @throws BootException\n *\n * @return \\Silex\\Application\n */\nreturn call_user_func(function () {\n    // Resolve Bolt-root\n    $boltRootPath = realpath(__DIR__ . '/..');\n\n    // Look for the autoloader in known positions relative to the Bolt-root,\n */\nreturn call_user_func(function () {\n    // Use UTF-8 for all multi-byte functions\n    mb_internal_encoding('UTF-8');\n    mb_http_output('UTF-8');\n\n    // Resolve Bolt-root\n    $boltRootPath = realpath(__DIR__ . '/..');\n        if (!file_exists($autoloadPath)) {\n            continue;\n        }\n\n        require_once $autoloadPath;\n\n        /** @deprecated Can be removed when support for PHP 5.5 is dropped. */\n        // Use UTF-8 for all multi-byte functions\n        \\mb_internal_encoding('UTF-8');\n        \\mb_http_output('UTF-8');\n\n        return Bootstrap::run($rootPath, $resourcesClass);\n    }\n\n    require_once $boltRootPath . '/src/Exception/BootException.php';\n    throw BootException::earlyExceptionComposer();\n});\n", 'message': 'Merge pull request #6385 from GawainLynch/hotfix/missing-multipbyte-confusion\n\n[3.2] Force mbstring functions call on root namespace', 'author_name': 'GitHub', 'lang': 'php'}