Merge pull request #6892 from GawainLynch/hotfix/bolt-common

[3.4] Implement use of bolt/common
bolt · Aug 19, 2017 · d26a516 · d26a516
2 parents 1989fd8 + a9077a9
commit d26a516
Show file tree

Hide file tree

Showing 88 changed files with 264 additions and 515 deletions.
diff --git a/composer.json b/composer.json
@@ -11,6 +11,7 @@
     "license": "MIT",
     "require": {
         "bolt/collection": "^1.1",
+        "bolt/common": "^1.0",
         "bolt/filesystem": "^2.3.1",
         "bolt/pathogen": "~0.6",
         "bolt/requirements": "^1.0@dev",

diff --git a/src/AccessControl/PermissionParser.php b/src/AccessControl/PermissionParser.php
@@ -2,6 +2,7 @@
 
 namespace Bolt\AccessControl;
 
+use Bolt\Common\Json;
 use Bolt\Exception\PermissionLexerException;
 use Bolt\Exception\PermissionParserException;
 
@@ -259,7 +260,7 @@ private static function expect($expected, $token)
             if ($token['match']) {
                 $actualStr .= " ('" . addslashes($token['match']) . "')";
             }
-            $actualStr .= ' <<< ' . json_encode($token) . ' >>> ';
+            $actualStr .= ' <<< ' . Json::dump($token) . ' >>> ';
             throw new PermissionParserException("Parser error: expected $expectedStr, but found $actualStr");
         }
     }

diff --git a/src/AccessControl/Permissions.php b/src/AccessControl/Permissions.php
@@ -2,6 +2,7 @@
 
 namespace Bolt\AccessControl;
 
+use Bolt\Common\Json;
 use Bolt\Exception\AccessControlException;
 use Bolt\Legacy\Content;
 use Bolt\Storage\Entity;
@@ -551,11 +552,11 @@ public function isAllowed($what, $user, $content = null, $contentId = null)
 
         $cacheKey = "_permission_rule:$what";
         if ($this->app['cache']->contains($cacheKey)) {
-            $rule = json_decode($this->app['cache']->fetch($cacheKey), true);
+            $rule = Json::parse($this->app['cache']->fetch($cacheKey));
         } else {
             $parser = new PermissionParser();
             $rule = $parser->run($what);
-            $this->app['cache']->save($cacheKey, json_encode($rule));
+            $this->app['cache']->save($cacheKey, Json::dump($rule));
         }
         $userRoles = $this->getEffectiveRolesForUser($user);
         $isAllowed = $this->isAllowedRule($rule, $user, $userRoles, $content, $contenttypeSlug, $contentId);

diff --git a/src/Application.php b/src/Application.php
@@ -2,9 +2,9 @@
 
 namespace Bolt;
 
+use Bolt\Common\Deprecated;
 use Bolt\Events\ControllerEvents;
 use Bolt\Events\MountEvent;
-use Bolt\Helpers\Deprecated;
 use Bolt\Legacy\AppSingleton;
 use Bolt\Provider\LoggerServiceProvider;
 use Bolt\Provider\PathServiceProvider;

diff --git a/src/Asset/Injector.php b/src/Asset/Injector.php
@@ -2,7 +2,7 @@
 
 namespace Bolt\Asset;
 
-use Bolt\Helpers\Str;
+use Bolt\Common\Str;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -81,7 +81,7 @@ protected function headTagStart(AssetInterface $asset, $rawHtml)
         if ($matches = $this->getMatches($rawHtml, '<head', true, false)) {
             $replacement = sprintf("%s\n%s\t%s", $matches[0], $matches[1], (string) $asset);
 
-            return Str::replaceFirst($matches[0], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0], $replacement);
         }
 
         return $this->tagSoup($asset, $rawHtml);
@@ -101,7 +101,7 @@ protected function headTagEnd(AssetInterface $asset, $rawHtml)
         if ($matches = $this->getMatches($rawHtml, '</head', false, false)) {
             $replacement = sprintf("%s\t%s\n%s", $matches[1], (string) $asset, $matches[0]);
 
-            return Str::replaceFirst($matches[0], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0], $replacement);
         }
 
         return $this->tagSoup($asset, $rawHtml);
@@ -121,7 +121,7 @@ protected function bodyTagStart(AssetInterface $asset, $rawHtml)
         if ($matches = $this->getMatches($rawHtml, '<body', true, false)) {
             $replacement = sprintf("%s\n%s\t%s", $matches[0], $matches[1], (string) $asset);
 
-            return Str::replaceFirst($matches[0], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0], $replacement);
         }
 
         return $this->tagSoup($asset, $rawHtml);
@@ -141,7 +141,7 @@ protected function bodyTagEnd(AssetInterface $asset, $rawHtml)
         if ($matches = $this->getMatches($rawHtml, '</body', false, false)) {
             $replacement = sprintf("%s\t%s\n%s", $matches[1], $asset, $matches[0]);
 
-            return Str::replaceFirst($matches[0], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0], $replacement);
         }
 
         return $this->tagSoup($asset, $rawHtml);
@@ -161,7 +161,7 @@ protected function htmlTagEnd(AssetInterface $asset, $rawHtml)
         if ($matches = $this->getMatches($rawHtml, '</html', false, false)) {
             $replacement = sprintf("%s\t%s\n%s", $matches[1], $asset, $matches[0]);
 
-            return Str::replaceFirst($matches[0], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0], $replacement);
         }
 
         return $this->tagSoup($asset, $rawHtml);
@@ -181,7 +181,7 @@ protected function metaTagsAfter(AssetInterface $asset, $rawHtml)
             $last = count($matches[0]) - 1;
             $replacement = sprintf("%s\n%s%s", $matches[0][$last], $matches[1][$last], (string) $asset);
 
-            return Str::replaceFirst($matches[0][$last], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0][$last], $replacement);
         }
 
         return $this->headTagEnd($asset, $rawHtml);
@@ -201,7 +201,7 @@ protected function cssTagsAfter(AssetInterface $asset, $rawHtml)
             $last = count($matches[0]) - 1;
             $replacement = sprintf("%s\n%s%s", $matches[0][$last], $matches[1][$last], (string) $asset);
 
-            return Str::replaceFirst($matches[0][$last], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0][$last], $replacement);
         }
 
         return $this->headTagEnd($asset, $rawHtml);
@@ -220,7 +220,7 @@ protected function cssTagsBefore(AssetInterface $asset, $rawHtml)
         if ($matches = $this->getMatches($rawHtml, '<link', true, false)) {
             $replacement = sprintf("%s%s\n%s\t%s", $matches[1], $asset, $matches[0], $matches[1]);
 
-            return Str::replaceFirst($matches[0], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0], $replacement);
         }
 
         return $this->tagSoup($asset, $rawHtml);
@@ -239,7 +239,7 @@ protected function jsTagsBefore(AssetInterface $asset, $rawHtml)
         if ($matches = $this->getMatches($rawHtml, '<script', true, false)) {
             $replacement = sprintf("%s%s\n%s\t%s", $matches[1], $asset, $matches[0], $matches[1]);
 
-            return Str::replaceFirst($matches[0], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0], $replacement);
         }
 
         return $this->tagSoup($asset, $rawHtml);
@@ -271,7 +271,7 @@ protected function jsTagsAfter($asset, $rawHtml, $insidehead = false)
             $last = count($matches[0]) - 1;
             $replacement = sprintf("%s\n%s%s", $matches[0][$last], $matches[1][$last], (string) $asset);
 
-            return Str::replaceFirst($matches[0][$last], $replacement, $rawHtml);
+            return Str::replaceFirst($rawHtml, $matches[0][$last], $replacement);
         } elseif ($insidehead) {
             // Second attempt: entire document
             return $this->jsTagsAfter($asset, $rawHtml, false);

diff --git a/src/Asset/Snippet/Snippet.php b/src/Asset/Snippet/Snippet.php
@@ -2,6 +2,8 @@
 
 namespace Bolt\Asset\Snippet;
 
+use Bolt\Common\Exception\DumpException;
+use Bolt\Common\Serialization;
 use Bolt\Controller\Zone;
 use Twig\Markup;
 
@@ -150,8 +152,8 @@ private function getCallableResult()
         }
 
         try {
-            $msg = sprintf('Snippet loading failed with callable %s', serialize($this->callback));
-        } catch (\Exception $e) {
+            $msg = sprintf('Snippet loading failed with callable %s', Serialization::dump($this->callback));
+        } catch (DumpException $e) {
             $msg = sprintf('Snippet loading failed with an unknown callback.');
         }
 

diff --git a/src/Asset/Target.php b/src/Asset/Target.php
@@ -2,7 +2,7 @@
 
 namespace Bolt\Asset;
 
-use Bolt\Helpers\Deprecated;
+use Bolt\Common\Deprecated;
 
 /**
  * Bolt Snippet target location.

diff --git a/src/Asset/Widget/Queue.php b/src/Asset/Widget/Queue.php
@@ -7,8 +7,9 @@
 use Bolt\Asset\QueueInterface;
 use Bolt\Asset\Snippet\Snippet;
 use Bolt\Asset\Target;
+use Bolt\Common\Deprecated;
+use Bolt\Common\Thrower;
 use Bolt\Controller\Zone;
-use Bolt\Helpers\Deprecated;
 use Bolt\Render;
 use Doctrine\Common\Cache\CacheProvider;
 use Symfony\Component\HttpFoundation\Request;
@@ -203,22 +204,8 @@ protected function getHtml(WidgetAssetInterface $widget)
             return $html;
         }
 
-        /** @var \Exception $e */
-        $e = null;
-        set_error_handler(
-            function ($errno, $errstr) use (&$e) {
-                return $e = new \Exception($errstr, $errno);
-            }
-        );
-
-        // Get the HTML from object cast and rethrow an exception if present
-        $html = (string) $widget;
+        $html = Thrower::call([$widget, '__toString']);
 
-        restore_error_handler();
-
-        if ($e instanceof \Exception) {
-            throw $e;
-        }
         if ($widget->getCacheDuration() !== null) {
             $this->cache->save($key, $html, $widget->getCacheDuration());
         }

diff --git a/src/Cache.php b/src/Cache.php
@@ -2,11 +2,11 @@
 
 namespace Bolt;
 
+use Bolt\Common\Deprecated;
 use Bolt\Filesystem\CompositeFilesystemInterface;
 use Bolt\Filesystem\Exception\IOException;
 use Bolt\Filesystem\Handler\DirectoryInterface;
 use Bolt\Filesystem\Handler\HandlerInterface;
-use Bolt\Helpers\Deprecated;
 use Doctrine\Common\Cache\FilesystemCache;
 
 /**

diff --git a/src/Composer/Script/BootstrapYamlUpdater.php b/src/Composer/Script/BootstrapYamlUpdater.php
@@ -3,7 +3,7 @@
 namespace Bolt\Composer\Script;
 
 use Bolt\Collection\MutableBag;
-use Bolt\Helpers\Str;
+use Bolt\Common\Str;
 use Composer\IO\IOInterface;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
@@ -219,7 +219,7 @@ public function updatePaths(MutableBag $paths)
                 continue;
             }
             if ($appPathToTrim && strpos($path, $appPathToTrim) === 0) {
-                $path = Str::replaceFirst($appPathToTrim, '', $path);
+                $path = Str::replaceFirst($path, $appPathToTrim, '');
                 if ($path === $key) {
                     $paths->remove($key);
                 } else {

diff --git a/src/Config.php b/src/Config.php
@@ -3,6 +3,7 @@
 namespace Bolt;
 
 use Bolt\Collection\Arr;
+use Bolt\Common\Deprecated;
 use Bolt\Controller\Zone;
 use Bolt\Filesystem\Exception\FileNotFoundException;
 use Bolt\Filesystem\Exception\IOException;
@@ -11,7 +12,6 @@
 use Bolt\Filesystem\Handler\Image;
 use Bolt\Filesystem\Handler\JsonFile;
 use Bolt\Filesystem\Handler\ParsableInterface;
-use Bolt\Helpers\Deprecated;
 use Bolt\Helpers\Html;
 use Bolt\Helpers\Str;
 use Bolt\Storage\Database;
@@ -703,7 +703,7 @@ protected function parseDatabase(array $options)
         $options = array_replace($options, $master);
 
         // Add platform specific random functions
-        $driver = Str::replaceFirst('pdo_', '', $options['driver']);
+        $driver = \Bolt\Common\Str::replaceFirst($options['driver'], 'pdo_', '');
         if ($driver === 'sqlite') {
             $options['driver'] = 'pdo_sqlite';
             $options['randomfunction'] = 'RANDOM()';

diff --git a/src/Configuration/Check/BaseCheck.php b/src/Configuration/Check/BaseCheck.php
@@ -2,7 +2,7 @@
 
 namespace Bolt\Configuration\Check;
 
-use Bolt\Helpers\Deprecated;
+use Bolt\Common\Deprecated;
 use Silex\Application;
 
 /**

diff --git a/src/Configuration/Check/Result.php b/src/Configuration/Check/Result.php
@@ -2,7 +2,7 @@
 
 namespace Bolt\Configuration\Check;
 
-use Bolt\Helpers\Deprecated;
+use Bolt\Common\Deprecated;
 
 /**
  * A container class for a check result.

diff --git a/src/Configuration/Composer.php b/src/Configuration/Composer.php
@@ -2,7 +2,7 @@
 
 namespace Bolt\Configuration;
 
-use Bolt\Helpers\Deprecated;
+use Bolt\Common\Deprecated;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

diff --git a/src/Configuration/LowlevelChecks.php b/src/Configuration/LowlevelChecks.php
@@ -2,8 +2,8 @@
 
 namespace Bolt\Configuration;
 
+use Bolt\Common\Deprecated;
 use Bolt\Exception\BootException;
-use Bolt\Helpers\Deprecated;
 
 /**
  * @deprecated Deprecated since 3.1, to be removed in 4.0.
@@ -45,7 +45,7 @@ public function __construct($config = null)
 
         $this->config = $config;
         $this->magicQuotes = get_magic_quotes_gpc();
-        $this->safeMode = ini_get('safe_mode');
+        $this->safeMode = false;
         $this->isApache = (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false);
         $this->postgresLoaded = extension_loaded('pdo_pgsql');
         $this->sqliteLoaded = extension_loaded('pdo_sqlite');

diff --git a/src/Configuration/PathsProxy.php b/src/Configuration/PathsProxy.php
@@ -2,7 +2,7 @@
 
 namespace Bolt\Configuration;
 
-use Bolt\Helpers\Deprecated;
+use Bolt\Common\Deprecated;
 
 /**
  * Bolt\Configuration\ResourceManager::getPaths() is proxied here, which used to return a simple array.

diff --git a/src/Configuration/ResourceManager.php b/src/Configuration/ResourceManager.php
@@ -2,7 +2,7 @@
 
 namespace Bolt\Configuration;
 
-use Bolt\Helpers\Deprecated;
+use Bolt\Common\Deprecated;
 use Bolt\Legacy\AppSingleton;
 use Bolt\Pager\PagerManager;
 use Composer\Autoload\ClassLoader;

diff --git a/src/Configuration/YamlUpdater.php b/src/Configuration/YamlUpdater.php
@@ -3,9 +3,9 @@
 namespace Bolt\Configuration;
 
 use Bolt\Collection\MutableBag;
+use Bolt\Common\Deprecated;
 use Bolt\Filesystem\Exception\IOException;
 use Bolt\Filesystem\Handler\FileInterface;
-use Bolt\Helpers\Deprecated;
 use Silex\Application;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Inline;

diff --git a/src/Controller/Backend/FileManager.php b/src/Controller/Backend/FileManager.php
@@ -2,6 +2,7 @@
 
 namespace Bolt\Controller\Backend;
 
+use Bolt\Common\Str;
 use Bolt\Exception\FileNotStackableException;
 use Bolt\Filesystem\Exception\ExceptionInterface;
 use Bolt\Filesystem\Exception\FileNotFoundException;
@@ -14,7 +15,6 @@
 use Bolt\Form\FormType\FileUploadType;
 use Bolt\Form\Validator\Constraints;
 use Bolt\Helpers\Input;
-use Bolt\Helpers\Str;
 use Bolt\Translation\Translator as Trans;
 use Silex\ControllerCollection;
 use Symfony\Component\Form\Form;
@@ -24,6 +24,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Parser;
+use Webmozart\PathUtil\Path;
 
 /**
  * Backend controller for file/directory management routes.
@@ -330,16 +331,13 @@ private function getRelatedFiles(FileInterface $file)
     {
         // Match foo(_local).*(.dist)
         $base = $file->getFilename();
-        if (Str::endsWith($base, '.dist')) {
-            $base = substr($base, 0, -5);
-        }
-        $ext = pathinfo($base, PATHINFO_EXTENSION);
-        $base = Str::replaceLast(".$ext", '', $base);
-        $base = Str::replaceLast('_local', '', $base);
+        $ext = Path::getExtension($base);
+        $base = Path::getFilenameWithoutExtension($base);
+        $base = Str::replaceLast($base, '_local', '');
 
         $dir = $file->getParent();
         $related = [];
-        foreach ([".$ext", "_local.$ext", ".$ext.dist"] as $tail) {
+        foreach ([".$ext", "_local.$ext"] as $tail) {
             $f = $dir->getFile($base . $tail);
             if ($f->getFilename() !== $file->getFilename() && $f->exists()) {
                 $related[] = $f;