From ff23f6b015315f311082b4713ef1e36e50ee15bf Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 25 Feb 2019 11:29:48 +0200 Subject: [PATCH] Renamed `Grav\Framework\File\Formatter\FormatterInterface` to `Grav\Framework\File\Interfaces\FileFormatterInterface` --- system/src/Grav/Framework/File/DataFile.php | 8 ++++---- .../Grav/Framework/File/Formatter/AbstractFormatter.php | 4 +++- .../Grav/Framework/File/Formatter/MarkdownFormatter.php | 2 +- .../FileFormatterInterface.php} | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) rename system/src/Grav/Framework/File/{Formatter/FormatterInterface.php => Interfaces/FileFormatterInterface.php} (90%) diff --git a/system/src/Grav/Framework/File/DataFile.php b/system/src/Grav/Framework/File/DataFile.php index 94f9a98e9..b9a0e2a25 100644 --- a/system/src/Grav/Framework/File/DataFile.php +++ b/system/src/Grav/Framework/File/DataFile.php @@ -11,20 +11,20 @@ declare(strict_types=1); namespace Grav\Framework\File; -use Grav\Framework\File\Formatter\FormatterInterface; +use Grav\Framework\File\Interfaces\FileFormatterInterface; use RuntimeException; class DataFile extends AbstractFile { - /** @var FormatterInterface */ + /** @var FileFormatterInterface */ protected $formatter; /** * File constructor. * @param string $filepath - * @param FormatterInterface $formatter + * @param FileFormatterInterface $formatter */ - public function __construct($filepath, FormatterInterface $formatter) + public function __construct($filepath, FileFormatterInterface $formatter) { parent::__construct($filepath); diff --git a/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php b/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php index 195b62259..495b139d7 100644 --- a/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php +++ b/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php @@ -11,7 +11,9 @@ declare(strict_types=1); namespace Grav\Framework\File\Formatter; -abstract class AbstractFormatter implements FormatterInterface +use Grav\Framework\File\Interfaces\FileFormatterInterface; + +abstract class AbstractFormatter implements FileFormatterInterface { /** @var array */ private $config; diff --git a/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php b/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php index 0a4ee62e5..ccd8ee177 100644 --- a/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php +++ b/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php @@ -15,7 +15,7 @@ use Grav\Framework\File\Interfaces\FileFormatterInterface; class MarkdownFormatter extends AbstractFormatter { - /** @var FormatterInterface */ + /** @var FileFormatterInterface */ private $headerFormatter; public function __construct(array $config = [], FileFormatterInterface $headerFormatter = null) diff --git a/system/src/Grav/Framework/File/Formatter/FormatterInterface.php b/system/src/Grav/Framework/File/Interfaces/FileFormatterInterface.php similarity index 90% rename from system/src/Grav/Framework/File/Formatter/FormatterInterface.php rename to system/src/Grav/Framework/File/Interfaces/FileFormatterInterface.php index be00199e1..81544e4f0 100644 --- a/system/src/Grav/Framework/File/Formatter/FormatterInterface.php +++ b/system/src/Grav/Framework/File/Interfaces/FileFormatterInterface.php @@ -9,9 +9,9 @@ declare(strict_types=1); * @license MIT License; see LICENSE file for details. */ -namespace Grav\Framework\File\Formatter; +namespace Grav\Framework\File\Interfaces; -interface FormatterInterface extends \Serializable +interface FileFormatterInterface extends \Serializable { /** * Get default file extension from current formatter (with dot).