From 76ef26ced95cecc92c3efb13d5d5235e0746b92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 16:19:28 +0100 Subject: [PATCH 01/10] Added a test for #44 --- Test/IssueTest.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Test/IssueTest.php b/Test/IssueTest.php index eb42b4c..790bf40 100644 --- a/Test/IssueTest.php +++ b/Test/IssueTest.php @@ -57,4 +57,25 @@ public function testIssue48() 'issue-48/views/view.ctp' )); } + + public function testIssue44() + { + + $jade = << [ + 'indentWidth' => 2, + 'indentStyle' => ' ' + ]]); + + $this->assertEquals('', $renderer->compile($jade)); + } } \ No newline at end of file From 78360acc9026c44fcc89af475da62911f2f66930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 16:37:09 +0100 Subject: [PATCH 02/10] Added ConfigurableTrait docs --- Util/ConfigurableTrait.php | 110 +++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/Util/ConfigurableTrait.php b/Util/ConfigurableTrait.php index 02218e8..df96da3 100644 --- a/Util/ConfigurableTrait.php +++ b/Util/ConfigurableTrait.php @@ -1,12 +1,50 @@ + * @author Talesoft + * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) + * @license http://licenses.talesoft.io/2015/MIT.txt MIT License + * @version 1.3.5 + * @link http://jade.talesoft.io/docs/files/Util/Compiler.html + * @since File available since Release 1.3.5 + */ namespace Tale\Jade\Util; +/** + * Provides some utility methods to work with configuration arrays + * + * @package Tale\Jade\Util + */ trait ConfigurableTrait { + /** + * The options array. + * + * Keys are option names, values are option values + * @var array + */ private $_options = []; + /** + * Sets the options initially providing default- and optional user options. + * + * @param array $defaults the default options + * @param array|null $userOptions the optional options passed by the user + */ public function defineOptions(array $defaults, array $userOptions = null) { @@ -16,18 +54,49 @@ public function defineOptions(array $defaults, array $userOptions = null) $this->setOptions($userOptions, true); } + /** + * Returns the option array. + * + * @return array + */ public function getOptions() { return $this->_options; } + /** + * Returns a single option by its name. + * + * You can pass an optional default value (Default: null) + * + * @param string $name the name of the option to return + * @param mixed $default the default value if the option is not set (Default: null) + * + * @return mixed + */ public function getOption($name, $default = null) { return isset($this->_options[$name]) ? $this->_options[$name] : $default; } + /** + * Merges the current options with another option array. + * + * The second parameter makes this recursive. + * The functions used are array_replace and array_replace_recursive + * + * Passing the third parameter reverses the merge, so you don't overwrite + * passed options with existing one, but rather set them only if they + * don't exist yet (defaulting) + * + * @param array $options the options to merge with + * @param bool $recursive should we merge recursively or not + * @param bool $reverse should values be prepended rather than appended + * + * @return $this + */ public function setOptions(array $options, $recursive = false, $reverse = false) { @@ -43,12 +112,31 @@ public function setOptions(array $options, $recursive = false, $reverse = false) return $this; } + /** + * Replaces with all options passed, if they are not set yet. + * + * This is an alias to ->setOptions with the third parameter set + * to true. + * + * @param array $defaults the array of default options + * @param bool|false $recursive should we merge recursively or not + * + * @return $this + */ public function setDefaults(array $defaults, $recursive = false) { return $this->setOptions($defaults, $recursive, true); } + /** + * Sets a single option to the passed value. + * + * @param string $name the name of the option + * @param mixed $value the value of the option + * + * @return $this + */ public function setOption($name, $value) { @@ -57,6 +145,28 @@ public function setOption($name, $value) return $this; } + /** + * Forwards an option to an option array. + * + * e.g. + * options = [ + * 'target' => [ + * 'targetName' => null + * ], + * + * 'someOption' => 'someValue' + * ] + * + * options->forwardOption('someOption', 'target', 'targetName') + * will set ['target']['targetName'] to 'someValue' + * + * Notice that the third parameter can be omitted, it will + * be set to the same name as the first parameter then. + * + * @param string $name the name of the option to forward + * @param string $target the name of the option array to forward to + * @param string $targetName the name of the target option name inside the target array + */ public function forwardOption($name, $target, $targetName = null) { From 189974ac1b39b69a0c6fe35daf9efb7f391aecb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 17:33:11 +0100 Subject: [PATCH 03/10] Fixed a problem with attribute escaping --- Lexer.php | 1 + Test/IssueTest.php | 5 +++++ Test/views/issues/issue-48/escaping.jade | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 Test/views/issues/issue-48/escaping.jade diff --git a/Lexer.php b/Lexer.php index 84b6b75..c18b1ef 100644 --- a/Lexer.php +++ b/Lexer.php @@ -1715,6 +1715,7 @@ protected function scanAttributes() $token['escaped'] = false; $this->consume(); + $char = $this->peek(); } if (!$token['name'] || $char === '=') { diff --git a/Test/IssueTest.php b/Test/IssueTest.php index 790bf40..dd94bbc 100644 --- a/Test/IssueTest.php +++ b/Test/IssueTest.php @@ -56,6 +56,11 @@ public function testIssue48() $this->assertEquals(' ', $this->_renderer->render( 'issue-48/views/view.ctp' )); + + $this->assertEquals('
', $this->_renderer->render( + 'issue-48/escaping', + ['clipId' => 1] + )); } public function testIssue44() diff --git a/Test/views/issues/issue-48/escaping.jade b/Test/views/issues/issue-48/escaping.jade new file mode 100644 index 0000000..a5bedef --- /dev/null +++ b/Test/views/issues/issue-48/escaping.jade @@ -0,0 +1,2 @@ + +div(id!='clip_#{$clipId}') \ No newline at end of file From 3ef5a445d781a136f0a89c9c0371e52d0bb65bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 18:09:33 +0100 Subject: [PATCH 04/10] Fixed a tab conversion bug in parser configuration (#44) --- Compiler.php | 4 ++-- Compiler/Exception.php | 4 ++-- Filter.php | 4 ++-- Lexer.php | 11 +++++++---- Lexer/Exception.php | 4 ++-- Parser.php | 6 +++--- Parser/Exception.php | 4 ++-- Parser/Node.php | 4 ++-- Renderer.php | 8 ++++---- Renderer/Adapter/File.php | 4 ++-- Renderer/Adapter/Stream.php | 4 ++-- Renderer/Adapter/Stream/Wrapper.php | 4 ++-- Renderer/AdapterBase.php | 4 ++-- Test/ConfigTest.php | 20 ++++++++++++++++++++ Test/IssueTest.php | 24 ++++++++++++++++-------- Test/TagTest.php | 19 +++++++++++++++++++ Test/views/issues/issue-44.jade | 7 +++++++ Util/ConfigurableTrait.php | 2 +- functions.php | 2 +- tasks.php | 2 +- 20 files changed, 99 insertions(+), 42 deletions(-) create mode 100644 Test/views/issues/issue-44.jade diff --git a/Compiler.php b/Compiler.php index 6428c6a..097c080 100644 --- a/Compiler.php +++ b/Compiler.php @@ -21,7 +21,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Compiler.html * @since File available since Release 1.0 */ @@ -91,7 +91,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Compiler.html * @since File available since Release 1.0 */ diff --git a/Compiler/Exception.php b/Compiler/Exception.php index 2e8b11d..e37bcf0 100644 --- a/Compiler/Exception.php +++ b/Compiler/Exception.php @@ -16,7 +16,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Compiler.Exception.html * @since File available since Release 1.0 */ @@ -35,7 +35,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Compiler.Exception.html * @since File available since Release 1.0 */ diff --git a/Filter.php b/Filter.php index ef3d19b..72a2086 100644 --- a/Filter.php +++ b/Filter.php @@ -20,7 +20,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Filter.html * @since File available since Release 1.0 */ @@ -53,7 +53,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Filter.html * @since File available since Release 1.0 */ diff --git a/Lexer.php b/Lexer.php index c18b1ef..fadeb20 100644 --- a/Lexer.php +++ b/Lexer.php @@ -18,13 +18,14 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Lexer.html * @since File available since Release 1.0 */ namespace Tale\Jade; +use RuntimeException; use Tale\Jade\Lexer\Exception; /** @@ -60,7 +61,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Lexer.html * @since File available since Release 1.0 */ @@ -208,14 +209,14 @@ public function __construct(array $options = null) //Validate options if (!in_array($this->_options['indentStyle'], [null, self::INDENT_TAB, self::INDENT_SPACE])) - throw new \Exception( + throw new RuntimeException( "indentStyle needs to be null or one of the INDENT_* constants of the lexer" ); if (!is_null($this->_options['indentWidth']) && (!is_int($this->_options['indentWidth']) || $this->_options['indentWidth'] < 1) ) - throw new \Exception( + throw new RuntimeException( "indentWidth needs to be a integer above 0" ); } @@ -875,6 +876,8 @@ protected function scanIndent() $mixed = false; } else { + var_dump($this->_indentStyle, $this->_indentWidth, $spaces, $tabs, $mixed); + $this->throwException( "Mixed indentation style encountered. " ."Dont mix tabs and spaces. Stick to one of both." diff --git a/Lexer/Exception.php b/Lexer/Exception.php index 57be255..1c7add7 100644 --- a/Lexer/Exception.php +++ b/Lexer/Exception.php @@ -16,7 +16,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Lexer.Exception.html * @since File available since Release 1.0 */ @@ -34,7 +34,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Lexer.Exception.html * @since File available since Release 1.0 */ diff --git a/Parser.php b/Parser.php index dafcebc..d63f3a6 100644 --- a/Parser.php +++ b/Parser.php @@ -18,7 +18,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Parser.html * @since File available since Release 1.0 */ @@ -57,7 +57,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Parser.html * @since File available since Release 1.0 */ @@ -172,7 +172,7 @@ class Parser public function __construct(array $options = null, Lexer $lexer = null) { - $this->defineOptions(['lexerOptions' => $options], $options); + $this->defineOptions(['lexerOptions' => []], $options); $this->_lexer = $lexer ? $lexer : new Lexer($this->_options['lexerOptions']); } diff --git a/Parser/Exception.php b/Parser/Exception.php index eb13c2a..1ebfa56 100644 --- a/Parser/Exception.php +++ b/Parser/Exception.php @@ -16,7 +16,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Parser.Exception.html * @since File available since Release 1.0 */ @@ -34,7 +34,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Parser.Exception.html * @since File available since Release 1.0 */ diff --git a/Parser/Node.php b/Parser/Node.php index 9b7c55e..fa8e5a0 100644 --- a/Parser/Node.php +++ b/Parser/Node.php @@ -20,7 +20,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Parser.Node.html * @since File available since Release 1.0 */ @@ -40,7 +40,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Parser.Node.html * @since File available since Release 1.0 */ diff --git a/Renderer.php b/Renderer.php index 56f64b7..22538ce 100644 --- a/Renderer.php +++ b/Renderer.php @@ -18,7 +18,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Renderer.html * @since File available since Release 1.0 */ @@ -51,7 +51,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.html * @since File available since Release 1.0 */ @@ -144,8 +144,8 @@ public function __construct( $this->forwardOption('filterMap', 'compilerOptions'); $this->_lexer = $lexer ? $lexer : new Lexer($this->_options['lexerOptions']); - $this->_parser = $parser ? $parser : new Parser($this->_options['parserOptions'], $lexer); - $this->_compiler = $compiler ? $compiler : new Compiler($this->_options['compilerOptions'], $parser); + $this->_parser = $parser ? $parser : new Parser($this->_options['parserOptions'], $this->_lexer); + $this->_compiler = $compiler ? $compiler : new Compiler($this->_options['compilerOptions'], $this->_parser); } /** diff --git a/Renderer/Adapter/File.php b/Renderer/Adapter/File.php index 03aab83..e1c9111 100644 --- a/Renderer/Adapter/File.php +++ b/Renderer/Adapter/File.php @@ -20,7 +20,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Renderer.Adapter.File.html * @since File available since Release 1.0 */ @@ -59,7 +59,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.Adapter.File.html * @since File available since Release 1.0 */ diff --git a/Renderer/Adapter/Stream.php b/Renderer/Adapter/Stream.php index 012b553..16e073a 100644 --- a/Renderer/Adapter/Stream.php +++ b/Renderer/Adapter/Stream.php @@ -20,7 +20,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Renderer.Adapter.Stream.html * @since File available since Release 1.0 */ @@ -70,7 +70,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.Adapter.Stream.html * @since File available since Release 1.0 */ diff --git a/Renderer/Adapter/Stream/Wrapper.php b/Renderer/Adapter/Stream/Wrapper.php index 20c67bb..f667e8e 100644 --- a/Renderer/Adapter/Stream/Wrapper.php +++ b/Renderer/Adapter/Stream/Wrapper.php @@ -18,7 +18,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Renderer.Adapter.Stream.Wrapper.html * @since File available since Release 1.0 */ @@ -42,7 +42,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.Adapter.Stream.Wrapper.html * @since File available since Release 1.0 */ diff --git a/Renderer/AdapterBase.php b/Renderer/AdapterBase.php index 2f9f0f2..b8f6e4f 100644 --- a/Renderer/AdapterBase.php +++ b/Renderer/AdapterBase.php @@ -18,7 +18,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Renderer.AdapterBase.html * @since File available since Release 1.0 */ @@ -41,7 +41,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.AdapterBase.html * @since File available since Release 1.0 */ diff --git a/Test/ConfigTest.php b/Test/ConfigTest.php index 8662273..e8e5c55 100644 --- a/Test/ConfigTest.php +++ b/Test/ConfigTest.php @@ -30,6 +30,17 @@ public function testRendererForwardsOptionsToCompiler($option, $value) $this->assertEquals($value, $renderer->getCompiler()->getOption($option)); } + /** + * @dataProvider lexerOptionProvider + */ + public function testRendererForwardsOptionsToLexer($option, $value) + { + + $renderer = new Renderer(['lexerOptions' => [$option => $value]]); + + $this->assertEquals($value, $renderer->getLexer()->getOption($option)); + } + public function compilerOptionProvider() { @@ -43,4 +54,13 @@ public function compilerOptionProvider() ['mode', Compiler::MODE_XHTML] ]; } + + public function lexerOptionProvider() + { + + return [ + ['indentWidth', 8], + ['indentStyle', "\t"] + ]; + } } \ No newline at end of file diff --git a/Test/IssueTest.php b/Test/IssueTest.php index dd94bbc..b408bb0 100644 --- a/Test/IssueTest.php +++ b/Test/IssueTest.php @@ -68,19 +68,27 @@ public function testIssue44() $jade = << [ - 'indentWidth' => 2, - 'indentStyle' => ' ' - ]]); + $renderer = new Renderer([ + 'adapterOptions' => [ + 'path' => __DIR__.'/cache/issues' + ], + 'lexerOptions' => [ + 'indentWidth' => 2, + 'indentStyle' => ' ' + ], + 'pretty' => false, + 'paths' => [__DIR__.'/views/issues'] + ]); $this->assertEquals('', $renderer->compile($jade)); + $this->assertEquals('', $renderer->compileFile('issue-44')); } } \ No newline at end of file diff --git a/Test/TagTest.php b/Test/TagTest.php index 4776a97..33b8e6e 100644 --- a/Test/TagTest.php +++ b/Test/TagTest.php @@ -56,6 +56,25 @@ public function testNestedTag() $this->assertEquals('

Test

', $this->_compiler->compile($jade)); } + public function testTabTags() + { + + $jade = <<assertEquals('

Some text

Some link
', $this->_compiler->compile($jade)); + } + public function testComplexNestedTag() { diff --git a/Test/views/issues/issue-44.jade b/Test/views/issues/issue-44.jade new file mode 100644 index 0000000..9430eaf --- /dev/null +++ b/Test/views/issues/issue-44.jade @@ -0,0 +1,7 @@ +- + /** + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) + */ + +doctype html \ No newline at end of file diff --git a/Util/ConfigurableTrait.php b/Util/ConfigurableTrait.php index df96da3..0925911 100644 --- a/Util/ConfigurableTrait.php +++ b/Util/ConfigurableTrait.php @@ -16,7 +16,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/Util/Compiler.html * @since File available since Release 1.3.5 */ diff --git a/functions.php b/functions.php index 09fbbf1..7c2bb31 100644 --- a/functions.php +++ b/functions.php @@ -18,7 +18,7 @@ * @author Talesoft * @copyright Copyright (c) 2015 Talesoft (http://talesoft.io) * @license http://licenses.talesoft.io/2015/MIT.txt MIT License - * @version 1.3.5 + * @version 1.3.6 * @link http://jade.talesoft.io/docs/files/functions.html * @since File available since Tag 1.0.1 */ diff --git a/tasks.php b/tasks.php index 394a6e2..2f2965e 100644 --- a/tasks.php +++ b/tasks.php @@ -10,7 +10,7 @@ './.git' ]; -$newVersion = '1.3.5'; +$newVersion = '1.3.6'; if (!$newVersion) { From 7a32cf68d05c406a286e49d6ca10128025909f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 18:31:33 +0100 Subject: [PATCH 05/10] Disabled xdebug in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 04dc848..06e1142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,6 @@ php: - hhvm before_script: + - phpenv config-rm xdebug.ini - composer self-update - composer install \ No newline at end of file From 3abfc903f9cca3e1e6d30156a57c99434564a0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 18:48:28 +0100 Subject: [PATCH 06/10] Debugging travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 06e1142..cf872f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: php +git: + depth: 5 + php: - 5.5 - 5.6 @@ -8,6 +11,7 @@ php: - hhvm before_script: + - echo $TRAVIS_PHP_VERSION - phpenv config-rm xdebug.ini - composer self-update - composer install \ No newline at end of file From 420a24dd88b552bb74eacfa22152136a40eb8bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 18:51:09 +0100 Subject: [PATCH 07/10] Fixed HVVM builds --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf872f1..ed99112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ php: - hhvm before_script: - - echo $TRAVIS_PHP_VERSION - - phpenv config-rm xdebug.ini + - if [ $TRAVIS_PHP_VERSION = "hhvm" ]; then phpenv config-rm xdebug.ini - composer self-update - composer install \ No newline at end of file From 9274dd76cfcf79745e712177966470659fdd9e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 18:53:35 +0100 Subject: [PATCH 08/10] Actually fixed travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed99112..57ea082 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,6 @@ php: - hhvm before_script: - - if [ $TRAVIS_PHP_VERSION = "hhvm" ]; then phpenv config-rm xdebug.ini + - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi; - composer self-update - composer install \ No newline at end of file From 06cfe6ff45a548a338cf15965287961d4b36308a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 18:58:16 +0100 Subject: [PATCH 09/10] Optimized travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57ea082..9d996bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,5 @@ php: before_script: - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi; - - composer self-update - - composer install \ No newline at end of file + - travis_retry composer self-update + - travis_retry composer install \ No newline at end of file From 0046e6a8426954927f178df879e7018227ae71ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20K=C3=B6hn?= Date: Sat, 16 Jan 2016 19:37:32 +0100 Subject: [PATCH 10/10] Testing travis.yml --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d996bd..e8a3b7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,7 @@ php: before_script: - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi; - - travis_retry composer self-update - - travis_retry composer install \ No newline at end of file + +install: + - composer self-update + - composer install --no-dev \ No newline at end of file