Merge pull request #5 from demyanovs/release-2.1.0

demyanovs · web-flow · commit 98b5f20acbbd · 2023-06-13T22:53:06.000+02:00
Release 2.1.0
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,4 +23,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2.0.0] - 2023-06-03
 - Completely redesigned project structure 
 - Updated syntaxes to PHP 8.1
-- Updated examples
+- Updated examples
+- 
+## [2.1.0] - 2023-06-13
+- Set PHP minimum version in composer
+- Throws UnknownThemeException
+- Added tests
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ See full example here [index.php](../master/examples/index.php)
 require_once 'vendor/autoload.php';
 
 use Demyanovs\PHPHighlight\Highlighter;
+use Demyanovs\PHPHighlight\Themes\ObsidianTheme;
 
 $text = '
 <pre data-file="php-highlight/examples/index.php" data-lang="php">
diff --git a/composer.json b/composer.json
@@ -17,6 +17,7 @@
         }
     ],
     "require": {
+        "php": ">=8.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/examples/css/highlighter.css b/examples/css/highlighter.css
@@ -54,8 +54,3 @@
 .code-highlighter .line-number {
     display: block;
 }
-
-.code-block-wrapper .copy-text {
-    font-size: 16px;
-    cursor: pointer;
-}
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -17,22 +17,22 @@
     <!-- Include full Doctrine Coding Standard -->
     <rule ref="Doctrine">
         <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat.DisallowedShortNullable"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing.MultipleSpacesBetweenTypeHintAndParameter"/>
         <exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFallbackGlobalName"/>
-        <exclude name="SlevomatCodingStandard.Variables.UselessVariable.UselessVariable"/>
         <exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName"/>
+        <exclude name="SlevomatCodingStandard.Variables.UselessVariable.UselessVariable"/>
         <exclude name="SlevomatCodingStandard.Classes.UnusedPrivateElements.UnusedMethod"/>
+        <exclude name="SlevomatCodingStandard.Classes.PropertyDeclaration.MultipleSpacesBetweenTypeHintAndProperty"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix"/>
         <exclude name="SlevomatCodingStandard.Commenting.RequireOneLineDocComment.MultiLineDocComment"/>
         <exclude name="SlevomatCodingStandard.ControlStructures.EarlyExit.EarlyExitNotUsed"/>
         <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion.RequiredExplicitAssertion"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat.DisallowedShortNullable"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing.MultipleSpacesBetweenTypeHintAndParameter"/>
-        <exclude name="SlevomatCodingStandard.Classes.PropertyDeclaration.MultipleSpacesBetweenTypeHintAndProperty"/>
         <exclude name="Generic.Formatting.SpaceAfterNot.Incorrect"/>
         <exclude name="Generic.Formatting.MultipleStatementAlignment.NotSame"/>
         <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint"/>
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.NewlineBeforeOpenBrace"/>
     </rule>
 
     <exclude-pattern>examples/</exclude-pattern>
-    <exclude-pattern>src/Traits</exclude-pattern>
 </ruleset>
diff --git a/src/Highlighter.php b/src/Highlighter.php
@@ -15,6 +15,7 @@ class Highlighter
     private bool $showActionPanel = true;
 
     private Theme $theme;
+
     private ThemePool $themePool;
 
     /**
diff --git a/src/Themes/C64Theme.php b/src/Themes/C64Theme.php
@@ -22,13 +22,6 @@ public function __construct()
             '#588D43;',
         );
 
-        $XMLColorSchemaDto = new XMLColorSchemaDto(
-            '#70A4B2; font-weight;',
-            '#9A6759;',
-            '#9AD284;',
-            '#6C6C6C;',
-        );
-
         $PHPColorSchemaDto = new PHPColorSchemaDto(
             '#FFFFFF;',
             '#9AD284;',
@@ -37,6 +30,13 @@ public function __construct()
             '#B8C76F;',
         );
 
+        $XMLColorSchemaDto = new XMLColorSchemaDto(
+            '#70A4B2; font-weight;',
+            '#9A6759;',
+            '#9AD284;',
+            '#6C6C6C;',
+        );
+
         parent::__construct(self::TITLE, $defaultColorSchemaDto, $PHPColorSchemaDto, $XMLColorSchemaDto);
     }
 }
diff --git a/src/Themes/DarkulaTheme.php b/src/Themes/DarkulaTheme.php
@@ -22,13 +22,6 @@ public function __construct()
             '#cb7832;',
         );
 
-        $XMLColorSchemaDto = new XMLColorSchemaDto(
-            '#cb7832;',
-            '#bababa;',
-            '#6896ba;',
-            '#7f7f7f;',
-        );
-
         $PHPColorSchemaDto = new PHPColorSchemaDto(
             '#bababa;',
             '#7f7f7f; font-weight: bold;',
@@ -37,6 +30,13 @@ public function __construct()
             '#6a8759;',
         );
 
+        $XMLColorSchemaDto = new XMLColorSchemaDto(
+            '#cb7832;',
+            '#bababa;',
+            '#6896ba;',
+            '#7f7f7f;',
+        );
+
         parent::__construct(self::TITLE, $defaultColorSchemaDto, $PHPColorSchemaDto, $XMLColorSchemaDto);
     }
 }
diff --git a/src/Themes/DefaultTheme.php b/src/Themes/DefaultTheme.php
@@ -22,13 +22,6 @@ public function __construct()
             '#cb7832;',
         );
 
-        $XMLColorSchemaDto = new XMLColorSchemaDto(
-            '#008000;',
-            '#7D9029;',
-            '#BA2121;',
-            '#BC7A00;',
-        );
-
         $PHPColorSchemaDto = new PHPColorSchemaDto(
             '#0000BB;',
             '#FF8000;',
@@ -37,6 +30,13 @@ public function __construct()
             '#DD0000;',
         );
 
+        $XMLColorSchemaDto = new XMLColorSchemaDto(
+            '#008000;',
+            '#7D9029;',
+            '#BA2121;',
+            '#BC7A00;',
+        );
+
         parent::__construct(self::TITLE, $defaultColorSchemaDto, $PHPColorSchemaDto, $XMLColorSchemaDto);
     }
 }
diff --git a/src/Themes/Exception/UnknownThemeException.php b/src/Themes/Exception/UnknownThemeException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Demyanovs\PHPHighlight\Themes\Exception;
+
+class UnknownThemeException extends \LogicException
+{
+}
diff --git a/src/Themes/FarTheme.php b/src/Themes/FarTheme.php
@@ -22,13 +22,6 @@ public function __construct()
             '#ff0;',
         );
 
-        $XMLColorSchemaDto = new XMLColorSchemaDto(
-            '#fff; font-weight: bold;',
-            '#0ff;',
-            '#ff0;',
-            '#008080;',
-        );
-
         $PHPColorSchemaDto = new PHPColorSchemaDto(
             '#0ff;',
             '#888;',
@@ -37,6 +30,13 @@ public function __construct()
             '#ff0;',
         );
 
+        $XMLColorSchemaDto = new XMLColorSchemaDto(
+            '#fff; font-weight: bold;',
+            '#0ff;',
+            '#ff0;',
+            '#008080;',
+        );
+
         parent::__construct(self::TITLE, $defaultColorSchemaDto, $PHPColorSchemaDto, $XMLColorSchemaDto);
     }
 }
diff --git a/src/Themes/ObsidianTheme.php b/src/Themes/ObsidianTheme.php
@@ -22,13 +22,6 @@ public function __construct()
             '#ec7600;',
         );
 
-        $XMLColorSchemaDto = new XMLColorSchemaDto(
-            '#8cbbad; font-weight: bold;',
-            '#6d9cbe;',
-            '#ec7600;',
-            '#557182;',
-        );
-
         $PHPColorSchemaDto = new PHPColorSchemaDto(
             '#e0e2e4;',
             '#818e96;',
@@ -37,6 +30,13 @@ public function __construct()
             '#ec7600;',
         );
 
+        $XMLColorSchemaDto = new XMLColorSchemaDto(
+            '#8cbbad; font-weight: bold;',
+            '#6d9cbe;',
+            '#ec7600;',
+            '#557182;',
+        );
+
         parent::__construct(self::TITLE, $defaultColorSchemaDto, $PHPColorSchemaDto, $XMLColorSchemaDto);
     }
 }
diff --git a/src/Themes/RailscastsTheme.php b/src/Themes/RailscastsTheme.php
@@ -22,13 +22,6 @@ public function __construct()
             '#cb7832;',
         );
 
-        $XMLColorSchemaDto = new XMLColorSchemaDto(
-            '#e8bf6a;',
-            '#6d9cbe;',
-            '#519f50;',
-            '#9b859d;',
-        );
-
         $PHPColorSchemaDto = new PHPColorSchemaDto(
             '#e6e1dc;',
             '#bc9458;',
@@ -37,6 +30,13 @@ public function __construct()
             '#a5c261;',
         );
 
+        $XMLColorSchemaDto = new XMLColorSchemaDto(
+            '#e8bf6a;',
+            '#6d9cbe;',
+            '#519f50;',
+            '#9b859d;',
+        );
+
         parent::__construct(self::TITLE, $defaultColorSchemaDto, $PHPColorSchemaDto, $XMLColorSchemaDto);
     }
 }
diff --git a/src/Themes/ThemePool.php b/src/Themes/ThemePool.php
@@ -2,6 +2,8 @@
 
 namespace Demyanovs\PHPHighlight\Themes;
 
+use Demyanovs\PHPHighlight\Themes\Exception\UnknownThemeException;
+
 class ThemePool
 {
     private const THEMES_CLASSES = [
@@ -28,6 +30,9 @@ public function __construct(array $customThemes)
         $this->addCustomThemes($customThemes);
     }
 
+    /**
+     * @throws UnknownThemeException
+     */
     public function getByTitle(string $title): Theme
     {
         foreach ($this->themes as $theme) {
@@ -38,10 +43,7 @@ public function getByTitle(string $title): Theme
             }
         }
 
-        $theme = $this->themes['default'];
-        $theme->PHPColorSchemaDto->applyColors();
-
-        return $theme;
+        throw new UnknownThemeException(sprintf('Unknown theme: %s', $title));
     }
 
     private function addDefaultThemes(): void
diff --git a/src/Themes/VS2015Theme.php b/src/Themes/VS2015Theme.php
@@ -22,13 +22,6 @@ public function __construct()
             '#F0F0F0;',
         );
 
-        $XMLColorSchemaDto = new XMLColorSchemaDto(
-            '#569CD6; font-weight;',
-            '#9CDCFE;',
-            '#D69D85;',
-            '#9B9B9B;',
-        );
-
         $PHPColorSchemaDto = new PHPColorSchemaDto(
             '#DCDCDC;',
             '#57A64A;',
@@ -37,6 +30,13 @@ public function __construct()
             '#D69D85;',
         );
 
+        $XMLColorSchemaDto = new XMLColorSchemaDto(
+            '#569CD6; font-weight;',
+            '#9CDCFE;',
+            '#D69D85;',
+            '#9B9B9B;',
+        );
+
         parent::__construct(self::TITLE, $defaultColorSchemaDto, $PHPColorSchemaDto, $XMLColorSchemaDto);
     }
 }
diff --git a/tests/HighlighterTest.php b/tests/HighlighterTest.php
diff --git a/tests/Themes/ThemeTest.php b/tests/Themes/ThemeTest.php

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`}`
`18`	`18`	`],`
`19`	`19`	`"require": {`
	`20`	`+ "php": ">=8.1"`
`20`	`21`	`},`
`21`	`22`	`"autoload": {`
`22`	`23`	`"psr-4": {`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,3 @@`
`54`	`54`	`.code-highlighter .line-number {`
`55`	`55`	`display: block;`
`56`	`56`	`}`
`57`		`-`
`58`		`-.code-block-wrapper .copy-text {`
`59`		`- font-size: 16px;`
`60`		`- cursor: pointer;`
`61`		`-}`