Remove JS stuff, now moved to Shim plugin.

src/Utility/Multibyte.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace Tools\Utility;
-
-/**
- * Multibyte handling methods.
- *
- * Shim class for 3.x built from 2.x core file.
- */
-
-/**
- * Multibyte handling methods.
- */
-class Multibyte {
-
-	/**
-	 * Converts a multibyte character string
-	 * to the decimal value of the character
-	 *
-	 * @param string $string String to convert.
-	 * @return array
-	 */
-	public static function utf8($string) {
-		$map = [];
-
-		$values = [];
-		$find = 1;
-		$length = strlen($string);
-
-		for ($i = 0; $i < $length; $i++) {
-			$value = ord($string[$i]);
-
-			if ($value < 128) {
-				$map[] = $value;
-			} else {
-				if (empty($values)) {
-					$find = ($value < 224) ? 2 : 3;
-				}
-				$values[] = $value;
-
-				if (count($values) === $find) {
-					if ($find == 3) {
-						$map[] = (($values[0] % 16) * 4096) + (($values[1] % 64) * 64) + ($values[2] % 64);
-					} else {
-						$map[] = (($values[0] % 32) * 64) + ($values[1] % 64);
-					}
-					$values = [];
-					$find = 1;
-				}
-			}
-		}
-		return $map;
-	}
-
-	/**
-	 * Converts the decimal value of a multibyte character string
-	 * to a string
-	 *
-	 * @param array $array Values array.
-	 * @return string
-	 */
-	public static function ascii($array) {
-		$ascii = '';
-
-		foreach ($array as $utf8) {
-			if ($utf8 < 128) {
-				$ascii .= chr($utf8);
-			} elseif ($utf8 < 2048) {
-				$ascii .= chr(192 + (($utf8 - ($utf8 % 64)) / 64));
-				$ascii .= chr(128 + ($utf8 % 64));
-			} else {
-				$ascii .= chr(224 + (($utf8 - ($utf8 % 4096)) / 4096));
-				$ascii .= chr(128 + ((($utf8 % 4096) - ($utf8 % 64)) / 64));
-				$ascii .= chr(128 + ($utf8 % 64));
-			}
-		}
-		return $ascii;
-	}
-
-}

src/View/Helper/JsHelper.php

@@ -1,347 +0,0 @@
-<?php
-/**
- * Javascript Generator class file.
- *
- * This is deprecated and only here to easy migration from 2.x applications
- * that rely on the JsHelper buffer functionality.
- */
-
-namespace Tools\View\Helper;
-
-use Cake\View\Helper;
-use Tools\Utility\Multibyte;
-
-/**
- * Javascript Generator helper class for easy use of JavaScript.
- *
- * JsHelper provides an abstract interface for authoring JavaScript with a
- * given client-side library.
- *
- * Note: onDomReady always defaults to false now, you will to add this yourself.
- */
-class JsHelper extends Helper {
-
-	/**
-	 * Whether or not you want scripts to be buffered or output.
-	 *
-	 * @var bool
-	 */
-	public $bufferScripts = true;
-
-	/**
-	 * Helper dependencies
-	 *
-	 * @var array
-	 */
-	public $helpers = ['Html', 'Form'];
-
-	/**
-	 * Variables to pass to Javascript.
-	 *
-	 * @var array
-	 */
-	protected $_jsVars = [];
-
-	/**
-	 * Scripts that are queued for output
-	 *
-	 * @var array
-	 */
-	protected $_bufferedScripts = [];
-
-	/**
-	 * The javascript variable created by set() variables.
-	 *
-	 * @var string
-	 */
-	public $setVariable = 'app';
-
-	/**
-	 * Generates a JavaScript object in JavaScript Object Notation (JSON)
-	 * from an array. Will use native JSON encode method if available, and $useNative == true
-	 *
-	 * ### Options:
-	 *
-	 * - `prefix` - String prepended to the returned data.
-	 * - `postfix` - String appended to the returned data.
-	 *
-	 * @param array $data Data to be converted.
-	 * @param array $options Set of options, see above.
-	 * @return string A JSON code block
-	 */
-	public function object($data = [], $options = []) {
-		$defaultOptions = [
-			'prefix' => '', 'postfix' => '',
-		];
-		$options += $defaultOptions;
-
-		return $options['prefix'] . json_encode($data) . $options['postfix'];
-	}
-
-	/**
-	 * Converts a PHP-native variable of any type to a JSON-equivalent representation
-	 *
-	 * @param mixed $val A PHP variable to be converted to JSON
-	 * @param bool $quoteString If false, leaves string values unquoted
-	 * @return string a JavaScript-safe/JSON representation of $val
-	 */
-	public function value($val = [], $quoteString = true) {
-		if ($quoteString === null) {
-			$quoteString = true;
-		}
-		switch (true) {
-			case (is_array($val) || is_object($val)):
-				$val = $this->object($val);
-				break;
-			case ($val === null):
-				$val = 'null';
-				break;
-			case (is_bool($val)):
-				$val = ($val === true) ? 'true' : 'false';
-				break;
-			case (is_int($val)):
-				break;
-			case (is_float($val)):
-				$val = sprintf('%.11f', $val);
-				break;
-			default:
-				$val = $this->escape($val);
-				if ($quoteString) {
-					$val = '"' . $val . '"';
-				}
-		}
-		return $val;
-	}
-
-	/**
-	 * Escape a string to be JSON friendly.
-	 *
-	 * List of escaped elements:
-	 *
-	 * - "\r" => '\n'
-	 * - "\n" => '\n'
-	 * - '"' => '\"'
-	 *
-	 * @param string $string String that needs to get escaped.
-	 * @return string Escaped string.
-	 */
-	public function escape($string) {
-		return $this->_utf8ToHex($string);
-	}
-
-	/**
-	 * Encode a string into JSON. Converts and escapes necessary characters.
-	 *
-	 * @param string $string The string that needs to be utf8->hex encoded
-	 * @return string
-	 */
-	protected function _utf8ToHex($string) {
-		$length = strlen($string);
-		$return = '';
-		for ($i = 0; $i < $length; ++$i) {
-			$ord = ord($string{$i});
-			switch (true) {
-				case $ord == 0x08:
-					$return .= '\b';
-					break;
-				case $ord == 0x09:
-					$return .= '\t';
-					break;
-				case $ord == 0x0A:
-					$return .= '\n';
-					break;
-				case $ord == 0x0C:
-					$return .= '\f';
-					break;
-				case $ord == 0x0D:
-					$return .= '\r';
-					break;
-				case $ord == 0x22:
-				case $ord == 0x2F:
-				case $ord == 0x5C:
-					$return .= '\\' . $string{$i};
-					break;
-				case (($ord >= 0x20) && ($ord <= 0x7F)):
-					$return .= $string{$i};
-					break;
-				case (($ord & 0xE0) == 0xC0):
-					if ($i + 1 >= $length) {
-						$i += 1;
-						$return .= '?';
-						break;
-					}
-					$charbits = $string{$i} . $string{$i + 1};
-					$char = Multibyte::utf8($charbits);
-					$return .= sprintf('\u%04s', dechex($char[0]));
-					$i += 1;
-					break;
-				case (($ord & 0xF0) == 0xE0):
-					if ($i + 2 >= $length) {
-						$i += 2;
-						$return .= '?';
-						break;
-					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2};
-					$char = Multibyte::utf8($charbits);
-					$return .= sprintf('\u%04s', dechex($char[0]));
-					$i += 2;
-					break;
-				case (($ord & 0xF8) == 0xF0):
-					if ($i + 3 >= $length) {
-						$i += 3;
-						$return .= '?';
-						break;
-					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3};
-					$char = Multibyte::utf8($charbits);
-					$return .= sprintf('\u%04s', dechex($char[0]));
-					$i += 3;
-					break;
-				case (($ord & 0xFC) == 0xF8):
-					if ($i + 4 >= $length) {
-						$i += 4;
-						$return .= '?';
-						break;
-					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4};
-					$char = Multibyte::utf8($charbits);
-					$return .= sprintf('\u%04s', dechex($char[0]));
-					$i += 4;
-					break;
-				case (($ord & 0xFE) == 0xFC):
-					if ($i + 5 >= $length) {
-						$i += 5;
-						$return .= '?';
-						break;
-					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4} . $string{$i + 5};
-					$char = Multibyte::utf8($charbits);
-					$return .= sprintf('\u%04s', dechex($char[0]));
-					$i += 5;
-					break;
-			}
-		}
-		return $return;
-	}
-
-	/**
-	 * Writes all Javascript generated so far to a code block or
-	 * caches them to a file and returns a linked script. If no scripts have been
-	 * buffered this method will return null. If the request is an XHR(ajax) request
-	 * onDomReady will be set to false. As the dom is already 'ready'.
-	 *
-	 * ### Options
-	 *
-	 * - `inline` - Set to true to have scripts output as a script block inline
-	 *   if `cache` is also true, a script link tag will be generated. (default true)
-	 * - `cache` - Set to true to have scripts cached to a file and linked in (default false)
-	 * - `clear` - Set to false to prevent script cache from being cleared (default true)
-	 * - `onDomReady` - wrap cached scripts in domready event (default true)
-	 * - `safe` - if an inline block is generated should it be wrapped in <![CDATA[ ... ]]> (default true)
-	 *
-	 * @param array $options options for the code block
-	 * @return mixed Completed javascript tag if there are scripts, if there are no buffered
-	 *   scripts null will be returned.
-	 * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::writeBuffer
-	 */
-	public function writeBuffer($options = []) {
-		$domReady = false;
-		$defaults = [
-			'onDomReady' => $domReady,
-			'cache' => false, 'clear' => true, 'safe' => true
-		];
-		$options += $defaults;
-		$script = implode("\n", $this->getBuffer($options['clear']));
-
-		if (empty($script)) {
-			return null;
-		}
-
-		if ($options['onDomReady']) {
-			$script = $this->{$this->_engineName}->domReady($script);
-		}
-		$opts = $options;
-		unset($opts['onDomReady'], $opts['cache'], $opts['clear']);
-
-		if (isset($opts['inline'])) {
-			unset($opts['inline']);
-		}
-		$return = $this->Html->scriptBlock($script, $opts);
-
-		return $return;
-	}
-
-	/**
-	 * Write a script to the buffered scripts.
-	 *
-	 * @param string $script Script string to add to the buffer.
-	 * @param bool $top If true the script will be added to the top of the
-	 *   buffered scripts array. If false the bottom.
-	 * @return void
-	 * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::buffer
-	 */
-	public function buffer($script, $top = false) {
-		if ($top) {
-			array_unshift($this->_bufferedScripts, $script);
-		} else {
-			$this->_bufferedScripts[] = $script;
-		}
-	}
-
-	/**
-	 * Get all the buffered scripts
-	 *
-	 * @param bool $clear Whether or not to clear the script caches (default true)
-	 * @return array Array of scripts added to the request.
-	 * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::getBuffer
-	 */
-	public function getBuffer($clear = true) {
-		$this->_createVars();
-		$scripts = $this->_bufferedScripts;
-		if ($clear) {
-			$this->_bufferedScripts = [];
-			$this->_jsVars = [];
-		}
-		return $scripts;
-	}
-
-	/**
-	 * Generates the object string for variables passed to javascript and adds to buffer
-	 *
-	 * @return void
-	 */
-	protected function _createVars() {
-		if (!empty($this->_jsVars)) {
-			$setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'window.' . $this->setVariable;
-			$this->buffer($setVar . ' = ' . $this->object($this->_jsVars) . ';', true);
-		}
-	}
-
-	/**
-	 * Pass variables into Javascript. Allows you to set variables that will be
-	 * output when the buffer is fetched with `JsHelper::getBuffer()` or `JsHelper::writeBuffer()`
-	 * The Javascript variable used to output set variables can be controlled with `JsHelper::$setVariable`
-	 *
-	 * @param string|array $one Either an array of variables to set, or the name of the variable to set.
-	 * @param string|array|null $two If $one is a string, $two is the value for that key.
-	 * @return void
-	 * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::set
-	 */
-	public function set($one, $two = null) {
-		$data = null;
-		if (is_array($one)) {
-			if (is_array($two)) {
-				$data = array_combine($one, $two);
-			} else {
-				$data = $one;
-			}
-		} else {
-			$data = [$one => $two];
-		}
-		if (!$data) {
-			return;
-		}
-		$this->_jsVars = array_merge($this->_jsVars, $data);
-	}
-
-}

tests/TestCase/View/Helper/JsHelperTest.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace Tools\Test\TestCase\View\Helper;
-
-use Cake\View\View;
-use Tools\TestSuite\TestCase;
-use Tools\View\Helper\JsHelper;
-
-class JsHelperTest extends TestCase {
-
-	/**
-	 * @return void
-	 */
-	public function setUp() {
-		parent::setUp();
-
-		$this->Js = new JsHelper(new View(null));
-	}
-
-	/**
-	 * @return void
-	 */
-	public function tearDown() {
-		unset($this->Table);
-
- 		//TableRegistry::clear();
-		parent::tearDown();
-	}
-
-	/**
-	 * @return void
-	 */
-	public function testObject() {
-		$this->assertInstanceOf('Tools\View\Helper\JsHelper', $this->Js);
-	}
-
-	/**
-	 * JsHelperTest::testBuffer()
-	 *
-	 * @return void
-	 */
-	public function testBuffer() {
-		$script = <<<JS
-jQuery(document).ready(function() {
-	// Code
-});
-JS;
-		$this->Js->buffer($script);
-
-		$output = $this->Js->writeBuffer();
-
-		$expected = <<<HTML
-<script>
-//<![CDATA[
-jQuery(document).ready(function() {
-	// Code
-});
-//]]>
-</script>
-HTML;
-		$this->assertTextEquals($expected, $output);
-	}
-
-}