From a7364b37de5e2bd43d229dadb2a90b58c9ea6975 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 20 Aug 2014 15:52:22 +0100
Subject: [PATCH] Issue #2324113 by penyaskito: Move Drupal/Core/Utility/Color
to Drupal/Component/Utility/Color.
---
core/includes/form.inc | 2 +-
core/lib/Drupal/{Core => Component}/Utility/Color.php | 10 ++++------
.../image/src/Plugin/ImageEffect/RotateImageEffect.php | 2 +-
.../Tests/{Core => Component}/Utility/ColorTest.php | 6 +++---
4 files changed, 9 insertions(+), 11 deletions(-)
rename core/lib/Drupal/{Core => Component}/Utility/Color.php (91%)
rename core/tests/Drupal/Tests/{Core => Component}/Utility/ColorTest.php (96%)
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 859c0ce5027a..f76988b4b2d2 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -5,6 +5,7 @@
* Functions for form and batch generation and processing.
*/
+use Drupal\Component\Utility\Color;
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\Number;
use Drupal\Component\Utility\SafeMarkup;
@@ -16,7 +17,6 @@
use Drupal\Core\Form\OptGroup;
use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
-use Drupal\Core\Utility\Color;
use Symfony\Component\HttpFoundation\RedirectResponse;
/**
diff --git a/core/lib/Drupal/Core/Utility/Color.php b/core/lib/Drupal/Component/Utility/Color.php
similarity index 91%
rename from core/lib/Drupal/Core/Utility/Color.php
rename to core/lib/Drupal/Component/Utility/Color.php
index 5f6bddc4f232..4b09a282225d 100644
--- a/core/lib/Drupal/Core/Utility/Color.php
+++ b/core/lib/Drupal/Component/Utility/Color.php
@@ -2,12 +2,10 @@
/**
* @file
- * Definition of Drupal\Core\Utility\Color.
+ * Definition of Drupal\Component\Utility\Color.
*/
-namespace Drupal\Core\Utility;
-
-use Drupal\Component\Utility\Unicode;
+namespace Drupal\Component\Utility;
/**
* Performs color conversions.
@@ -15,7 +13,7 @@
class Color {
/**
- * Validates whether a hexadecimal color value is syntatically correct.
+ * Validates whether a hexadecimal color value is syntactically correct.
*
* @param $hex
* The hexadecimal string to validate. May contain a leading '#'. May use
@@ -56,7 +54,7 @@ public static function hexToRgb($hex) {
// Ignore '#' prefixes.
$hex = ltrim($hex, '#');
- // Convert shorhands like '#abc' to '#aabbcc'.
+ // Convert shorthands like '#abc' to '#aabbcc'.
if (strlen($hex) == 3) {
$hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
}
diff --git a/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
index e0cb8de7d05f..078dbf6e993f 100644
--- a/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
+++ b/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
@@ -7,9 +7,9 @@
namespace Drupal\image\Plugin\ImageEffect;
+use Drupal\Component\Utility\Color;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Image\ImageInterface;
-use Drupal\Core\Utility\Color;
use Drupal\image\ConfigurableImageEffectBase;
/**
diff --git a/core/tests/Drupal/Tests/Core/Utility/ColorTest.php b/core/tests/Drupal/Tests/Component/Utility/ColorTest.php
similarity index 96%
rename from core/tests/Drupal/Tests/Core/Utility/ColorTest.php
rename to core/tests/Drupal/Tests/Component/Utility/ColorTest.php
index e54d445ab877..a8d90312045f 100644
--- a/core/tests/Drupal/Tests/Core/Utility/ColorTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/ColorTest.php
@@ -2,12 +2,12 @@
/**
* @file
- * Contains \Drupal\Tests\Core\Utility\ColorTest.
+ * Contains \Drupal\Tests\Component\Utility\ColorTest.
*/
-namespace Drupal\Tests\Core\Utility;
+namespace Drupal\Tests\Component\Utility;
-use Drupal\Core\Utility\Color;
+use Drupal\Component\Utility\Color;
use Drupal\Tests\UnitTestCase;
/**
--
GitLab