Skip to content

Commit b015a4d

Browse files
spuddickspuddick
committed
fix: merge tool
2 parents 1988740 + 2e1120b commit b015a4d

37 files changed

+1260
-188
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.sass-cache
2+
scss_cache
23
composer.lock
3-
pscss.phar
44
/*.css
55
/*.scss
66
/_site/

‎.travis.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ php:
66
- 5.5
77
- 5.6
88
- 7.0
9+
- 7.1
910
- nightly
1011

1112
script:
12-
- phpunit tests
13+
- composer install
14+
- vendor/bin/phpunit tests
1315

1416
branches:
1517
only:

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@ compat:
66

77
standard:
88
vendor/bin/phpcs --standard=PSR2 bin src tests *.php
9-
10-
phar:
11-
php -dphar.readonly=0 vendor/bin/box build -v

‎bin/pscss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Options include:
7676
-i=path Set import path
7777
--iso8859-1 Use iso8859-1 encoding instead of utf-8 (default utf-8)
7878
--line-numbers Annotate selectors with comments referring to the source file and line number
79-
-p=precision Set decimal number precision (default 5)
79+
-p=precision Set decimal number precision (default 10)
8080
-T Dump formatted parse tree
8181
-v, --version Print the version
8282

‎box.json.dist‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎composer.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
},
2626
"require-dev": {
2727
"squizlabs/php_codesniffer": "~2.5",
28-
"phpunit/phpunit": "~3.7",
29-
"kherge/box": "~2.5"
28+
"phpunit/phpunit": "~4.6"
3029
},
3130
"bin": ["bin/pscss"],
3231
"archive": {
@@ -35,7 +34,6 @@
3534
"/.gitattributes",
3635
"/.gitignore",
3736
"/.travis.yml",
38-
"/box.json.dist",
3937
"/phpunit.xml.dist",
4038
"/tests"
4139
]

src/Server.php renamed to example/Server.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* SCSSPHP
44
*
5-
* @copyright 2012-2015 Leaf Corcoran
5+
* @copyright 2012-2017 Leaf Corcoran
66
*
77
* @license http://opensource.org/licenses/MIT MIT
88
*
@@ -434,7 +434,7 @@ public function __construct($dir, $cacheDir = null, $scss = null)
434434
$this->cacheDir = $cacheDir;
435435

436436
if (! is_dir($this->cacheDir)) {
437-
mkdir($this->cacheDir, 0755, true);
437+
throw new ServerException('Cache directory doesn\'t exist: ' . $cacheDir);
438438
}
439439

440440
if (! isset($scss)) {
@@ -446,18 +446,7 @@ public function __construct($dir, $cacheDir = null, $scss = null)
446446
$this->showErrorsAsCSS = false;
447447

448448
if (! ini_get('date.timezone')) {
449-
date_default_timezone_set('UTC');
449+
throw new ServerException('Default date.timezone not set');
450450
}
451451
}
452-
453-
/**
454-
* Helper method to serve compiled scss
455-
*
456-
* @param string $path Root path
457-
*/
458-
public static function serveFrom($path)
459-
{
460-
$server = new self($path);
461-
$server->serve();
462-
}
463452
}

‎scss.inc.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
throw new \Exception('scssphp requires PHP 5.4 or above');
44
}
55

6-
if (! class_exists('scssc', false)) {
6+
if (! class_exists('Leafo\ScssPhp\Version', false)) {
77
include_once __DIR__ . '/src/Base/Range.php';
88
include_once __DIR__ . '/src/Block.php';
99
include_once __DIR__ . '/src/Colors.php';
@@ -26,5 +26,4 @@
2626
include_once __DIR__ . '/src/Type.php';
2727
include_once __DIR__ . '/src/Util.php';
2828
include_once __DIR__ . '/src/Version.php';
29-
include_once __DIR__ . '/src/Server.php';
3029
}

‎src/Base/Range.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* SCSSPHP
44
*
5-
* @copyright 2015 Leaf Corcoran
5+
* @copyright 2017 Leaf Corcoran
66
*
77
* @license http://opensource.org/licenses/MIT MIT
88
*

‎src/Block.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* SCSSPHP
44
*
5-
* @copyright 2012-2015 Leaf Corcoran
5+
* @copyright 2012-2017 Leaf Corcoran
66
*
77
* @license http://opensource.org/licenses/MIT MIT
88
*
@@ -28,6 +28,11 @@ class Block
2828
*/
2929
public $parent;
3030

31+
/**
32+
* @var string;
33+
*/
34+
public $sourceName;
35+
3136
/**
3237
* @var integer
3338
*/

0 commit comments

Comments
 (0)