merge remote changes

oyejorge · Sep 24, 2015 · 8cd680a · 8cd680a
2 parents 046cd93 + 947599f
commit 8cd680a
Show file tree

Hide file tree

Showing 58 changed files with 13 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,12 @@
 language: php
+
 php:
-  - "7"
-  - "5.6"
-  - "5.5"
-  - "5.4"
-  - "5.3"
+  - 7
+  - 5.6
+  - 5.5
+  - 5.4
+  - 5.3
   - hhvm
+  - nightly
+
+sudo: false
diff --git a/lib/Less/.easymin/ignore_prefixes b/lib/Less/.easymin/ignore_prefixes
diff --git a/lib/Less/Cache.php b/lib/Less/Cache.php
@@ -91,8 +91,8 @@ public static function Get( $less_files, $parser_options = array(), $modify_vars
 				self::ListFiles($list_file, $list, $cached_name);
 				$compiled_name = self::CompiledName($list);
 
-				// if $cached_name != $compiled_name, we know we need to recompile
-				if( !$cached_name || $cached_name !== $compiled_name ){
+				// if $cached_name is the same as the $compiled name, don't regenerate
+				if( !$cached_name || $cached_name === $compiled_name ){
 
 					$output_file = self::OutputFile($compiled_name, $parser_options );
 

diff --git a/lib/Less/Colors.php b/lib/Less/Colors.php
diff --git a/lib/Less/Configurable.php b/lib/Less/Configurable.php
diff --git a/lib/Less/Environment.php b/lib/Less/Environment.php
diff --git a/lib/Less/Exception/Chunk.php b/lib/Less/Exception/Chunk.php
diff --git a/lib/Less/Exception/Compiler.php b/lib/Less/Exception/Compiler.php
diff --git a/lib/Less/Exception/Parser.php b/lib/Less/Exception/Parser.php
diff --git a/lib/Less/Functions.php b/lib/Less/Functions.php
diff --git a/lib/Less/Less.php.combine b/lib/Less/Less.php.combine
diff --git a/lib/Less/Mime.php b/lib/Less/Mime.php
diff --git a/lib/Less/Output/Mapped.php b/lib/Less/Output/Mapped.php
diff --git a/lib/Less/Parser.php b/lib/Less/Parser.php
diff --git a/lib/Less/SourceMap/Base64VLQ.php b/lib/Less/SourceMap/Base64VLQ.php
diff --git a/lib/Less/SourceMap/Generator.php b/lib/Less/SourceMap/Generator.php
diff --git a/lib/Less/Tree.php b/lib/Less/Tree.php
diff --git a/lib/Less/Tree/Alpha.php b/lib/Less/Tree/Alpha.php
diff --git a/lib/Less/Tree/Anonymous.php b/lib/Less/Tree/Anonymous.php
diff --git a/lib/Less/Tree/Assignment.php b/lib/Less/Tree/Assignment.php
diff --git a/lib/Less/Tree/Attribute.php b/lib/Less/Tree/Attribute.php
diff --git a/lib/Less/Tree/Call.php b/lib/Less/Tree/Call.php
diff --git a/lib/Less/Tree/Color.php b/lib/Less/Tree/Color.php
diff --git a/lib/Less/Tree/Comment.php b/lib/Less/Tree/Comment.php
diff --git a/lib/Less/Tree/Condition.php b/lib/Less/Tree/Condition.php
diff --git a/lib/Less/Tree/Dimension.php b/lib/Less/Tree/Dimension.php
diff --git a/lib/Less/Tree/Directive.php b/lib/Less/Tree/Directive.php
diff --git a/lib/Less/Tree/Element.php b/lib/Less/Tree/Element.php
diff --git a/lib/Less/Tree/Expression.php b/lib/Less/Tree/Expression.php
diff --git a/lib/Less/Tree/Extend.php b/lib/Less/Tree/Extend.php
diff --git a/lib/Less/Tree/Import.php b/lib/Less/Tree/Import.php
diff --git a/lib/Less/Tree/Javascript.php b/lib/Less/Tree/Javascript.php
diff --git a/lib/Less/Tree/Keyword.php b/lib/Less/Tree/Keyword.php
diff --git a/lib/Less/Tree/Media.php b/lib/Less/Tree/Media.php
diff --git a/lib/Less/Tree/Mixin/Call.php b/lib/Less/Tree/Mixin/Call.php
diff --git a/lib/Less/Tree/Mixin/Definition.php b/lib/Less/Tree/Mixin/Definition.php
diff --git a/lib/Less/Tree/NameValue.php b/lib/Less/Tree/NameValue.php
diff --git a/lib/Less/Tree/Negative.php b/lib/Less/Tree/Negative.php
diff --git a/lib/Less/Tree/Operation.php b/lib/Less/Tree/Operation.php
diff --git a/lib/Less/Tree/Paren.php b/lib/Less/Tree/Paren.php
diff --git a/lib/Less/Tree/Quoted.php b/lib/Less/Tree/Quoted.php
diff --git a/lib/Less/Tree/Rule.php b/lib/Less/Tree/Rule.php
diff --git a/lib/Less/Tree/Ruleset.php b/lib/Less/Tree/Ruleset.php
diff --git a/lib/Less/Tree/Selector.php b/lib/Less/Tree/Selector.php
diff --git a/lib/Less/Tree/UnicodeDescriptor.php b/lib/Less/Tree/UnicodeDescriptor.php
diff --git a/lib/Less/Tree/Unit.php b/lib/Less/Tree/Unit.php
diff --git a/lib/Less/Tree/UnitConversions.php b/lib/Less/Tree/UnitConversions.php
diff --git a/lib/Less/Tree/Url.php b/lib/Less/Tree/Url.php
diff --git a/lib/Less/Tree/Value.php b/lib/Less/Tree/Value.php
diff --git a/lib/Less/Tree/Variable.php b/lib/Less/Tree/Variable.php
diff --git a/lib/Less/Version.php b/lib/Less/Version.php
@@ -1,4 +1,4 @@
-<?php
+ <?php
 
 /**
  * Release numbers
@@ -8,7 +8,7 @@
  */
 class Less_Version{
 
-	const version = '1.7.0.6';			// The current build number of less.php
+	const version = '1.7.0.7';			// The current build number of less.php
 	const less_version = '1.7';			// The less.js version that this build should be compatible with
     const cache_version = '170';		// The parser cache version
 

diff --git a/lib/Less/Visitor.php b/lib/Less/Visitor.php
diff --git a/lib/Less/Visitor/extendFinder.php b/lib/Less/Visitor/extendFinder.php
diff --git a/lib/Less/Visitor/import.php b/lib/Less/Visitor/import.php
diff --git a/lib/Less/Visitor/joinSelector.php b/lib/Less/Visitor/joinSelector.php
diff --git a/lib/Less/Visitor/processExtends.php b/lib/Less/Visitor/processExtends.php
diff --git a/lib/Less/Visitor/toCSS.php b/lib/Less/Visitor/toCSS.php
diff --git a/lib/Less/VisitorReplacing.php b/lib/Less/VisitorReplacing.php