From 1875b6fb895699fa855e9859e2ae5fe35a0c4355 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Thu, 14 Jun 2012 17:28:26 +1200 Subject: [PATCH] MDL-33468 css_optimiser: Coding style clean up and renamed cssslib_test => csslib_test --- lib/csslib.php | 284 +++++++++++------- .../{cssslib_test.php => csslib_test.php} | 0 2 files changed, 178 insertions(+), 106 deletions(-) rename lib/tests/{cssslib_test.php => csslib_test.php} (100%) diff --git a/lib/csslib.php b/lib/csslib.php index 8058e1952e6..621b571905b 100644 --- a/lib/csslib.php +++ b/lib/csslib.php @@ -17,15 +17,15 @@ /** * This file contains CSS related class, and function for the CSS optimiser * - * Please see the {@see css_optimiser} class for greater detail. + * Please see the {@link css_optimiser} class for greater detail. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -//NOTE: do not verify MOODLE_INTERNAL here, this is used from themes too +// NOTE: do not verify MOODLE_INTERNAL here, this is used from themes too /** * Stores CSS in a file at the given path. @@ -175,7 +175,7 @@ function css_send_cached_css($csspath, $etag) { * that theme designers could utilise the optimised output during development to * help them optimise their CSS... not that they should write lazy CSS. * - * @param string CSS + * @param string $css */ function css_send_uncached_css($css) { global $CFG; @@ -309,29 +309,36 @@ EOD; * - HSL colour: hsl(0-360, 0-100%, 0-100%) * - HSLA colour: hsla(0-360, 0-100%, 0-100%, 0-1) * - * Or a recognised browser colour mapping {@see css_optimiser::$htmlcolours} + * Or a recognised browser colour mapping {@link css_optimiser::$htmlcolours} * * @param string $value The colour value to check * @return bool */ function css_is_colour($value) { $value = trim($value); + + $hex = '/^#([a-fA-F0-9]{1,3}|[a-fA-F0-9]{6})$/'; + $rgb = '#^rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$#i'; + $rgba = '#^rgba\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1}(\.\d+)?)\s*\)$#i'; + $hsl = '#^hsl\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\%\s*,\s*(\d{1,3})\%\s*\)$#i'; + $hsla = '#^hsla\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\%\s*,\s*(\d{1,3})\%\s*,\s*(\d{1}(\.\d+)?)\s*\)$#i'; + if (in_array(strtolower($value), array('inherit'))) { return true; - } else if (preg_match('/^#([a-fA-F0-9]{1,3}|[a-fA-F0-9]{6})$/', $value)) { + } else if (preg_match($hex, $value)) { return true; } else if (in_array(strtolower($value), array_keys(css_optimiser::$htmlcolours))) { return true; - } else if (preg_match('#^rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$#i', $value, $m) && $m[1] < 256 && $m[2] < 256 && $m[3] < 256) { + } else if (preg_match($rgb, $value, $m) && $m[1] < 256 && $m[2] < 256 && $m[3] < 256) { // It is an RGB colour return true; - } else if (preg_match('#^rgba\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1}(\.\d+)?)\s*\)$#i', $value, $m) && $m[1] < 256 && $m[2] < 256 && $m[3] < 256) { + } else if (preg_match($rgba, $value, $m) && $m[1] < 256 && $m[2] < 256 && $m[3] < 256) { // It is an RGBA colour return true; - } else if (preg_match('#^hsl\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\%\s*,\s*(\d{1,3})\%\s*\)$#i', $value, $m) && $m[1] <= 360 && $m[2] <= 100 && $m[3] <= 100) { + } else if (preg_match($hsl, $value, $m) && $m[1] <= 360 && $m[2] <= 100 && $m[3] <= 100) { // It is an HSL colour return true; - } else if (preg_match('#^hsla\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\%\s*,\s*(\d{1,3})\%\s*,\s*(\d{1}(\.\d+)?)\s*\)$#i', $value, $m) && $m[1] <= 360 && $m[2] <= 100 && $m[3] <= 100) { + } else if (preg_match($hsla, $value, $m) && $m[1] <= 360 && $m[2] <= 100 && $m[3] <= 100) { // It is an HSLA colour return true; } @@ -384,7 +391,7 @@ function css_sort_by_count(array $a, array $b) { * ensure we collect all mappings, at the end of the processing those styles are * then combined into an optimised form to keep them as short as possible. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -785,6 +792,14 @@ class css_optimiser { return trim($css); } + /** + * Produces CSS for the given charset, imports, media, and keyframes + * @param string $charset + * @param array $imports + * @param array $medias + * @param array $keyframes + * @return string + */ protected function produce_css($charset, array $imports, array $medias, array $keyframes) { $css = ''; if (!empty($charset)) { @@ -1147,7 +1162,7 @@ class css_optimiser { /** * Used to prepare CSS strings * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -1329,7 +1344,7 @@ abstract class css_writer { * The selector is the classes, id, elements, and psuedo bits that make up a CSS * rule. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -1420,7 +1435,7 @@ class css_selector { /** * A structure to represent a CSS rule. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -1428,13 +1443,13 @@ class css_selector { class css_rule { /** - * An array of CSS selectors {@see css_selector} + * An array of CSS selectors {@link css_selector} * @var array */ protected $selectors = array(); /** - * An array of CSS styles {@see css_style} + * An array of CSS styles {@link css_style} * @var array */ protected $styles = array(); @@ -1529,7 +1544,7 @@ class css_rule { /** * An easy method of adding several styles at once. Just calls add_style. * - * This method simply iterates over the array and calls {@see css_rule::add_style()} + * This method simply iterates over the array and calls {@link css_rule::add_style()} * with each. * * @param array $styles Adds an array of styles @@ -1638,7 +1653,7 @@ class css_rule { $finalstyles[] = $style; } } - $finalstyles = array_merge($finalstyles,$advancedstyles); + $finalstyles = array_merge($finalstyles, $advancedstyles); return $finalstyles; } @@ -1730,7 +1745,7 @@ class css_rule { /** * Returns the error strings that were recorded when processing this rule. * - * Before calling this function you should first call {@see css_rule::has_errors()} + * Before calling this function you should first call {@link css_rule::has_errors()} * to make sure there are errors (hopefully there arn't). * * @return string @@ -1770,7 +1785,7 @@ class css_rule { * group rules together for a purpose. * When no declaration is specified rules accumulate into @media all. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -1898,7 +1913,7 @@ abstract class css_rule_collection { /** * A media class to organise rules by the media they apply to. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -1941,6 +1956,7 @@ class css_media extends css_rule_collection { /** * Returns all of the reset rules known by this media set. + * @param bool $remove If set to true reset rules will be removed before being returned. * @return array */ public function get_reset_rules($remove = false) { @@ -1960,7 +1976,7 @@ class css_media extends css_rule_collection { /** * A media class to organise rules by the media they apply to. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2011,7 +2027,7 @@ class css_keyframe extends css_rule_collection { /** * An absract class to represent CSS styles * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2126,6 +2142,7 @@ abstract class css_style { /** * Returns the value for the style * + * @param bool $includeimportant If set to true and the rule is important !important postfix will be used. * @return string */ public function get_value($includeimportant = true) { @@ -2248,7 +2265,7 @@ abstract class css_style { /** * A generic CSS style class to use when a more specific class does not exist. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2274,7 +2291,7 @@ class css_style_generic extends css_style { /** * A colour CSS style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2359,7 +2376,7 @@ class css_style_color extends css_style { /** * A width style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2405,7 +2422,7 @@ class css_style_width extends css_style { /** * A margin style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2508,10 +2525,18 @@ class css_style_margin extends css_style_width { $left = null; foreach ($styles as $style) { switch ($style->get_name()) { - case 'margin-top' : $top = $style->get_value(false);break; - case 'margin-right' : $right = $style->get_value(false);break; - case 'margin-bottom' : $bottom = $style->get_value(false);break; - case 'margin-left' : $left = $style->get_value(false);break; + case 'margin-top' : + $top = $style->get_value(false); + break; + case 'margin-right' : + $right = $style->get_value(false); + break; + case 'margin-bottom' : + $bottom = $style->get_value(false); + break; + case 'margin-left' : + $left = $style->get_value(false); + break; } } if ($top == $bottom && $left == $right) { @@ -2536,7 +2561,7 @@ class css_style_margin extends css_style_width { /** * A margin top style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2566,7 +2591,7 @@ class css_style_margintop extends css_style_margin { /** * A margin right style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2596,7 +2621,7 @@ class css_style_marginright extends css_style_margin { /** * A margin bottom style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2626,7 +2651,7 @@ class css_style_marginbottom extends css_style_margin { /** * A margin left style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2656,7 +2681,7 @@ class css_style_marginleft extends css_style_margin { /** * A border style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -2715,20 +2740,44 @@ class css_style_border extends css_style { foreach ($styles as $style) { switch ($style->get_name()) { - case 'border-top-width': $borderwidths['top'] = $style->get_value(); break; - case 'border-right-width': $borderwidths['right'] = $style->get_value(); break; - case 'border-bottom-width': $borderwidths['bottom'] = $style->get_value(); break; - case 'border-left-width': $borderwidths['left'] = $style->get_value(); break; + case 'border-top-width': + $borderwidths['top'] = $style->get_value(); + break; + case 'border-right-width': + $borderwidths['right'] = $style->get_value(); + break; + case 'border-bottom-width': + $borderwidths['bottom'] = $style->get_value(); + break; + case 'border-left-width': + $borderwidths['left'] = $style->get_value(); + break; - case 'border-top-style': $borderstyles['top'] = $style->get_value(); break; - case 'border-right-style': $borderstyles['right'] = $style->get_value(); break; - case 'border-bottom-style': $borderstyles['bottom'] = $style->get_value(); break; - case 'border-left-style': $borderstyles['left'] = $style->get_value(); break; + case 'border-top-style': + $borderstyles['top'] = $style->get_value(); + break; + case 'border-right-style': + $borderstyles['right'] = $style->get_value(); + break; + case 'border-bottom-style': + $borderstyles['bottom'] = $style->get_value(); + break; + case 'border-left-style': + $borderstyles['left'] = $style->get_value(); + break; - case 'border-top-color': $bordercolors['top'] = css_style_color::shrink_value($style->get_value()); break; - case 'border-right-color': $bordercolors['right'] = css_style_color::shrink_value($style->get_value()); break; - case 'border-bottom-color': $bordercolors['bottom'] = css_style_color::shrink_value($style->get_value()); break; - case 'border-left-color': $bordercolors['left'] = css_style_color::shrink_value($style->get_value()); break; + case 'border-top-color': + $bordercolors['top'] = css_style_color::shrink_value($style->get_value()); + break; + case 'border-right-color': + $bordercolors['right'] = css_style_color::shrink_value($style->get_value()); + break; + case 'border-bottom-color': + $bordercolors['bottom'] = css_style_color::shrink_value($style->get_value()); + break; + case 'border-left-color': + $bordercolors['left'] = css_style_color::shrink_value($style->get_value()); + break; } } @@ -2933,9 +2982,15 @@ class css_style_border extends css_style { } else if (!is_null($width) && is_null($style) && is_null($color)) { $array[] = new $class($cssstyle, $width); } else { - if (!is_null($width)) $array[] = new $class($cssstyle, $width); - if (!is_null($style)) $array[] = new $class($cssstyle, $style); - if (!is_null($color)) $array[] = new $class($cssstyle, $color); + if (!is_null($width)) { + $array[] = new $class($cssstyle, $width); + } + if (!is_null($style)) { + $array[] = new $class($cssstyle, $style); + } + if (!is_null($color)) { + $array[] = new $class($cssstyle, $color); + } } return true; } @@ -2944,7 +2999,7 @@ class css_style_border extends css_style { /** * A border colour style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3024,7 +3079,7 @@ class css_style_bordercolor extends css_style_color { /** * A border left style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3067,7 +3122,7 @@ class css_style_borderleft extends css_style_generic { /** * A border right style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3110,7 +3165,7 @@ class css_style_borderright extends css_style_generic { /** * A border top style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3153,7 +3208,7 @@ class css_style_bordertop extends css_style_generic { /** * A border bottom style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3196,7 +3251,7 @@ class css_style_borderbottom extends css_style_generic { /** * A border width style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3283,7 +3338,7 @@ class css_style_borderwidth extends css_style_width { /** * A border style style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3336,7 +3391,7 @@ class css_style_borderstyle extends css_style_generic { /** * A border top colour style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3366,7 +3421,7 @@ class css_style_bordertopcolor extends css_style_bordercolor { /** * A border left colour style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3396,7 +3451,7 @@ class css_style_borderleftcolor extends css_style_bordercolor { /** * A border right colour style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3426,7 +3481,7 @@ class css_style_borderrightcolor extends css_style_bordercolor { /** * A border bottom colour style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3456,7 +3511,7 @@ class css_style_borderbottomcolor extends css_style_bordercolor { /** * A border width top style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3486,7 +3541,7 @@ class css_style_bordertopwidth extends css_style_borderwidth { /** * A border width left style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3516,7 +3571,7 @@ class css_style_borderleftwidth extends css_style_borderwidth { /** * A border width right style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3546,7 +3601,7 @@ class css_style_borderrightwidth extends css_style_borderwidth { /** * A border width bottom style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3576,7 +3631,7 @@ class css_style_borderbottomwidth extends css_style_borderwidth { /** * A border top style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3606,7 +3661,7 @@ class css_style_bordertopstyle extends css_style_borderstyle { /** * A border left style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3636,7 +3691,7 @@ class css_style_borderleftstyle extends css_style_borderstyle { /** * A border right style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3666,7 +3721,7 @@ class css_style_borderrightstyle extends css_style_borderstyle { /** * A border bottom style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3676,6 +3731,7 @@ class css_style_borderbottomstyle extends css_style_borderstyle { /** * Initialises this style object * + * @param string $value The value for the style * @return css_style_borderbottomstyle */ public static function init($value) { @@ -3695,7 +3751,7 @@ class css_style_borderbottomstyle extends css_style_borderstyle { /** * A background style * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3705,7 +3761,7 @@ class css_style_background extends css_style { /** * Initialises a background style * - * @param type $value The value of the style + * @param string $value The value of the style * @return array An array of background component. */ public static function init($value) { @@ -3784,7 +3840,7 @@ class css_style_background extends css_style { } } if (count($widthbits)) { - $position = join(' ',$widthbits); + $position = join(' ', $widthbits); } } @@ -3888,14 +3944,30 @@ class css_style_background extends css_style { } $organisedstyles[$style->get_name()] = $style; switch ($style->get_name()) { - case 'background-color' : $color = css_style_color::shrink_value($style->get_value(false)); break; - case 'background-image' : $image = $style->get_value(false); break; - case 'background-repeat' : $repeat = $style->get_value(false); break; - case 'background-attachment' : $attachment = $style->get_value(false); break; - case 'background-position' : $position = $style->get_value(false); break; - case 'background-clip' : $clip = $style->get_value(); break; - case 'background-origin' : $origin = $style->get_value(); break; - case 'background-size' : $size = $style->get_value(); break; + case 'background-color' : + $color = css_style_color::shrink_value($style->get_value(false)); + break; + case 'background-image' : + $image = $style->get_value(false); + break; + case 'background-repeat' : + $repeat = $style->get_value(false); + break; + case 'background-attachment' : + $attachment = $style->get_value(false); + break; + case 'background-position' : + $position = $style->get_value(false); + break; + case 'background-clip' : + $clip = $style->get_value(); + break; + case 'background-origin' : + $origin = $style->get_value(); + break; + case 'background-size' : + $size = $style->get_value(); + break; } } @@ -3937,14 +4009,14 @@ class css_style_background extends css_style { foreach ($styles as $style) { $value = null; switch ($style->get_name()) { - case 'background-color' : $value = $color; break; - case 'background-image' : $value = $image; break; - case 'background-repeat' : $value = $repeat; break; + case 'background-color' : $value = $color; break; + case 'background-image' : $value = $image; break; + case 'background-repeat' : $value = $repeat; break; case 'background-attachment' : $value = $attachment; break; - case 'background-position' : $value = $position; break; - case 'background-clip' : $value = $clip; break; - case 'background-origin' : $value = $origin; break; - case 'background-size' : $value = $size; break; + case 'background-position' : $value = $position; break; + case 'background-clip' : $value = $clip; break; + case 'background-origin' : $value = $origin; break; + case 'background-size' : $value = $size; break; } if (!is_null($value)) { $return[] = $style; @@ -3958,7 +4030,7 @@ class css_style_background extends css_style { /** * A advanced background style that allows multiple values to preserve unknown entities * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -3991,7 +4063,7 @@ class css_style_background_advanced extends css_style_generic { * * Based upon the colour style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4042,7 +4114,7 @@ class css_style_backgroundcolor extends css_style_color { /** * A background image style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4096,7 +4168,7 @@ class css_style_backgroundimage extends css_style_generic { /** * A background image style that supports mulitple values and masquerades as a background-image * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4127,7 +4199,7 @@ class css_style_backgroundimage_advanced extends css_style_generic { /** * A background repeat style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4178,7 +4250,7 @@ class css_style_backgroundrepeat extends css_style_generic { /** * A background attachment style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4229,7 +4301,7 @@ class css_style_backgroundattachment extends css_style_generic { /** * A background position style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4280,7 +4352,7 @@ class css_style_backgroundposition extends css_style_generic { /** * A background size style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4310,7 +4382,7 @@ class css_style_backgroundsize extends css_style_generic { /** * A background clip style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4340,7 +4412,7 @@ class css_style_backgroundclip extends css_style_generic { /** * A background origin style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4370,7 +4442,7 @@ class css_style_backgroundorigin extends css_style_generic { /** * A padding style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4497,7 +4569,7 @@ class css_style_padding extends css_style_width { /** * A padding top style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4527,7 +4599,7 @@ class css_style_paddingtop extends css_style_padding { /** * A padding right style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4557,7 +4629,7 @@ class css_style_paddingright extends css_style_padding { /** * A padding bottom style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4587,7 +4659,7 @@ class css_style_paddingbottom extends css_style_padding { /** * A padding left style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4617,7 +4689,7 @@ class css_style_paddingleft extends css_style_padding { /** * A cursor style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4652,7 +4724,7 @@ class css_style_cursor extends css_style_generic { /** * A vertical alignment style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later @@ -4684,7 +4756,7 @@ class css_style_verticalalign extends css_style_generic { /** * A float style. * - * @package core_css + * @package core * @category css * @copyright 2012 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later diff --git a/lib/tests/cssslib_test.php b/lib/tests/csslib_test.php similarity index 100% rename from lib/tests/cssslib_test.php rename to lib/tests/csslib_test.php