License simplification

robocoder · robocoder · commit dc42946d83f5 · 2015-06-27T21:20:13.000-04:00
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/bin/pscss b/bin/pscss
@@ -5,7 +5,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/classmap.php b/classmap.php
@@ -6,7 +6,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/composer.json b/composer.json
@@ -5,8 +5,7 @@
     "keywords": ["css", "stylesheet", "scss", "sass", "less"],
     "homepage": "http://leafo.net/scssphp/",
     "license": [
-        "MIT",
-        "GPL-3.0"
+        "MIT"
     ],
     "authors": [
         {
diff --git a/site/templates/index.html b/site/templates/index.html
@@ -53,7 +53,7 @@ <h1><a href="$root">scssphp</a></h1>
   <div class="footer">
     <div class="inner">
       <div>
-        created by <a href="http://leafo.net">leaf corcoran</a> &middot; scssphp is licensed under GPL3/MIT
+        created by <a href="http://leafo.net">leaf corcoran</a> &middot; scssphp is licensed under MIT
       </div>
       <div>
         generated by <a href="http://github.com/leafo/sitegen">sitegen</a> on $generate_date
diff --git a/src/Colors.php b/src/Colors.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
@@ -1614,7 +1613,9 @@ public function compileValue($value)
                     $filtered[$this->compileValue($keys[$i])] = $this->compileValue($values[$i]);
                 }
 
-                array_walk($filtered, function (&$value, $key) { $value = $key . ': ' . $value; });
+                array_walk($filtered, function (&$value, $key) {
+                    $value = $key . ': ' . $value;
+                });
 
                 return '(' . implode(', ', $filtered) . ')';
             case 'interpolated': # node created by extractInterpolation
diff --git a/src/Formatter.php b/src/Formatter.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
@@ -54,7 +53,7 @@ abstract class Formatter
      */
     public $assignSeparator;
 
-    abstract function __construct();
+    abstract public function __construct();
 
     /**
      * Return indentation (whitespace)
diff --git a/src/Formatter/Compact.php b/src/Formatter/Compact.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/src/Formatter/Compressed.php b/src/Formatter/Compressed.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/src/Formatter/Crunched.php b/src/Formatter/Crunched.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/src/Formatter/Expanded.php b/src/Formatter/Expanded.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/src/Formatter/Nested.php b/src/Formatter/Nested.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/src/Parser.php b/src/Parser.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
@@ -1193,7 +1192,9 @@ protected function map(&$out)
         $keys = array();
         $values = array();
 
-        while ($this->genericList($key, 'expression') && $this->literal(':') && $this->genericList($value, 'expression')) {
+        while ($this->genericList($key, 'expression') && $this->literal(':')
+            && $this->genericList($value, 'expression')
+        ) {
             $keys[] = $key;
             $values[] = $value;
 
diff --git a/src/Server.php b/src/Server.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/src/Version.php b/src/Version.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/tests/ApiTest.php b/tests/ApiTest.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/tests/ExceptionTest.php b/tests/ExceptionTest.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/tests/FailingTest.php b/tests/FailingTest.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
@@ -61,6 +60,7 @@ public function testFailing($id, $scss, $expected)
      */
     public function provideFailing()
     {
+        // @codingStandardsIgnoreStart
         return array(
             array(
                 '#28 - @extend working unexpected', <<<'END_OF_SCSS'
@@ -404,6 +404,7 @@ public function provideFailing()
             ),
 *************************************************************/
         );
+        // @codingStandardsIgnoreEnd
     }
 
     private function compile($str)
diff --git a/tests/InputTest.php b/tests/InputTest.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/tests/ScssTest.php b/tests/ScssTest.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -4,7 +4,6 @@
  *
  * @copyright 2012-2015 Leaf Corcoran
  *
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
  * @license http://opensource.org/licenses/MIT MIT
  *
  * @link http://leafo.net/scssphp

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`*`
`6`	`6`	`* @copyright 2012-2015 Leaf Corcoran`
`7`	`7`	`*`
`8`		`- * @license http://opensource.org/licenses/gpl-license GPL-3.0`
`9`	`8`	`* @license http://opensource.org/licenses/MIT MIT`
`10`	`9`	`*`
`11`	`10`	`* @link http://leafo.net/scssphp`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`*`
`7`	`7`	`* @copyright 2012-2015 Leaf Corcoran`
`8`	`8`	`*`
`9`		`- * @license http://opensource.org/licenses/gpl-license GPL-3.0`
`10`	`9`	`* @license http://opensource.org/licenses/MIT MIT`
`11`	`10`	`*`
`12`	`11`	`* @link http://leafo.net/scssphp`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`*`
`5`	`5`	`* @copyright 2012-2015 Leaf Corcoran`
`6`	`6`	`*`
`7`		`- * @license http://opensource.org/licenses/gpl-license GPL-3.0`
`8`	`7`	`* @license http://opensource.org/licenses/MIT MIT`
`9`	`8`	`*`
`10`	`9`	`* @link http://leafo.net/scssphp`