Merge branch 'master' of github.com:BrightFlair/PHP.Gt

Conflicts: src/Data/Csv.php
PhpGt · Feb 11, 2015 · 21179d1 · 21179d1
2 parents 33dbb07 + b388d98
commit 21179d1
Show file tree

Hide file tree

Showing 118 changed files with 334 additions and 268 deletions.
diff --git a/License b/License
@@ -1,4 +1,4 @@
-Copyright 2011, 2014 Bright Flair Ltd. http://www.brightflair.com
+Copyright 2011, 2015 Bright Flair Ltd. http://www.brightflair.com
 
 The following license applies to all parts of this software except as
 documented below:
@@ -26,7 +26,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ====
 
-All files located in the vendor directory are externally maintained 
-libraries used by this software which have their own licenses; we 
-recommend you read them, as their terms may differ from the 
+All files located in the vendor directory are externally maintained
+libraries used by this software which have their own licenses; we
+recommend you read them, as their terms may differ from the
 terms above.
diff --git a/bin/create b/bin/create
@@ -4,8 +4,8 @@
  * Creates a new empty project using the blueprint-empty repository.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 use	Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/bin/install b/bin/install
@@ -5,8 +5,8 @@
  * project. Downloads composer if it doesn't already exist.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 $HOME = $_SERVER["HOME"];
 $gtDir = "$HOME/.gt";

diff --git a/bin/serve b/bin/serve
@@ -6,8 +6,8 @@
  * Usage: server [-a|--approot[="..."]] [-p|--port[="..."]]
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 use Gt\Cli\Server;
 use Symfony\Component\Console\Input\InputDefinition;

diff --git a/bin/test b/bin/test
@@ -8,8 +8,8 @@
  * Usage: test [-a|--approot[="..."]] [--type="unit|acceptance|all"]
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 use Gt\Cli\TestRunner;
 use Symfony\Component\Console\Input\InputDefinition;

diff --git a/src/Api/Api.php b/src/Api/Api.php
@@ -2,8 +2,8 @@
 /**
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Api/Component.php b/src/Api/Component.php
@@ -2,8 +2,8 @@
 /**
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Api/Endpoint.php b/src/Api/Endpoint.php
@@ -5,8 +5,8 @@
  * interact with the data source and also the API response as a Payload.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Api/InvalidLogicTypeException.php b/src/Api/InvalidLogicTypeException.php
@@ -3,8 +3,8 @@
  *
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Api/InvalidScriptTypeException.php b/src/Api/InvalidScriptTypeException.php
@@ -3,8 +3,8 @@
  *
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Api/Logic.php b/src/Api/Logic.php
@@ -9,8 +9,8 @@
  *    \Gt\Api\Logic rather than \Gt\Logic\ApiLogic
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Api/LogicNotFoundException.php b/src/Api/LogicNotFoundException.php
@@ -3,8 +3,8 @@
  *
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Api/Payload.php b/src/Api/Payload.php
@@ -4,8 +4,8 @@
  * over HTTP in the response.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Api;
 

diff --git a/src/Cli/Gatekeeper.php b/src/Cli/Gatekeeper.php
@@ -8,8 +8,8 @@
  * request / response within PHP.Gt.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 

diff --git a/src/Cli/Gateway.php b/src/Cli/Gateway.php
@@ -4,8 +4,8 @@
  * bytes, or to begin the request / response within PHP.Gt.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 

diff --git a/src/Cli/InvalidContextException.php b/src/Cli/InvalidContextException.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 

diff --git a/src/Cli/InvalidTestRunnerTypeException.php b/src/Cli/InvalidTestRunnerTypeException.php
@@ -2,8 +2,8 @@
 /**
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 

diff --git a/src/Cli/Process.php b/src/Cli/Process.php
@@ -4,8 +4,8 @@
  * and writes back to STDOUT.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 

diff --git a/src/Cli/ProcessFailedException.php b/src/Cli/ProcessFailedException.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 

diff --git a/src/Cli/Server.php b/src/Cli/Server.php
@@ -6,8 +6,8 @@
  * Used from the PHP.Gt/bin/server shell script.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 

diff --git a/src/Cli/TestRunner.php b/src/Cli/TestRunner.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\Cli;
 use \Gt\Core\Path;

diff --git a/src/ClientSide/Compiler.php b/src/ClientSide/Compiler.php
@@ -4,8 +4,8 @@
  * pre-processed Style Sheets or JavaScript.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\ClientSide;
 
@@ -25,7 +25,6 @@ class Compiler {
  */
 public static function parse($inputFile) {
 	$ext = strtolower(pathinfo($inputFile, PATHINFO_EXTENSION));
-
 	$content = file_get_contents($inputFile);
 
 	switch ($ext) {
@@ -36,23 +35,6 @@ public static function parse($inputFile) {
 		];
 		$scss = new ScssParser();
 		$scss->setImportPaths($importPaths);
-		$scss->addImportPath(function($path, $scss) use($importPaths) {
-			// Get the path of the current file, attempt relative path import.
-			$parsedFiles = $scss->getParsedFiles();
-			$currentFileImporting = end($parsedFiles);
-			$currentFileImporting = rtrim($currentFileImporting, "/");
-			$currentPath = pathinfo($currentFileImporting, PATHINFO_DIRNAME);
-			$relativePath = "$currentPath/$path";
-
-			if(is_file($path)) {
-				return $path;
-			}
-			if(is_file($relativePath)) {
-				return $relativePath;
-			}
-
-			return null;
-		});
 
 		// Add magic variable $appRoot.
 		$content = "\$APPROOT: \"" . Path::get(Path::ROOT)
@@ -65,9 +47,7 @@ public static function parse($inputFile) {
 		}
 		catch(\Exception $e) {
 			$msg = $e->getMessage();
-			if(strpos($msg, "parse error") < 1) {
-				throw new CompilerParseException("SCSS $msg");
-			}
+			throw new CompilerParseException("SCSS $msg");
 		}
 		break;
 

diff --git a/src/ClientSide/CompilerParseException.php b/src/ClientSide/CompilerParseException.php
@@ -3,8 +3,8 @@
  * Thrown when the compiled content failes due to a parsing error.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\ClientSide;
 

diff --git a/src/ClientSide/FileOrganiser.php b/src/ClientSide/FileOrganiser.php
@@ -5,8 +5,8 @@
  * are copied there.
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\ClientSide;
 

diff --git a/src/ClientSide/Manifest.php b/src/ClientSide/Manifest.php
@@ -2,8 +2,8 @@
 /**
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\ClientSide;
 

diff --git a/src/ClientSide/Minifier.php b/src/ClientSide/Minifier.php
@@ -2,8 +2,8 @@
 /**
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\ClientSide;
 

diff --git a/src/ClientSide/PageManifest.php b/src/ClientSide/PageManifest.php
@@ -2,8 +2,8 @@
 /**
  *
  * PHP.Gt (http://php.gt)
- * @copyright Copyright Ⓒ 2014 Bright Flair Ltd. (http://brightflair.com)
- * @license Apache Version 2.0, January 2004. http://www.apache.org/licenses
+ * @copyright Copyright Ⓒ 2015 Bright Flair Ltd. (http://brightflair.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
 namespace Gt\ClientSide;