diff --git a/README.md b/README.md index ce12b8f..268bfd4 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ You can set the style of your SASS file to suit your needs: $sass->setStyle(Sass::STYLE_COMPRESSED); As the [Libsass](https://github.com/hcatlin/libsass) library has matured to get closer to 100% SASS coverage, so this extension has also matured: + * SASS file compilation is an array when a source map file is specified. * The ability to define source comments * The ability to embed the source map into the CSS output @@ -117,10 +118,10 @@ You can set the source map file for the library to use: This needs to be done prior to getting the output of the map file. As it stands, both the output of the SASS file compile & the SASS source map file generation sequence are both strings. The first array item will always be the compiled SASS file: - $css[0] +$css[0] The second array item will always be the source map output: - $css[1] +$css[1] You can set the root of the generated source map file like so: @@ -153,33 +154,34 @@ These extensions also utilise the [Libsass](https://github.com/hcatlin/libsass) ## Changelog -| Release | Description | -| --- | --- | -| 0.5.15 | Fallout - Atom (Libsass 3.5.2) | -| 0.5.14 | Karol - Caroline (Libsass 3.4.8) | -| 0.5.13 | Ray - Manta (Libsass 3.4.5) & PHP stub file | -| 0.5.12 | Cartography - MapRoot functions | -| 0.5.11 | Zoomer (Libsass 3.4.4) stable | -| 0.5.10 | Elwood (Libsass 3.4.3) stable & Travis fix | -| 0.5.9 | Rickshaw (Libsass 3.4.2) stable | -| 0.5.8 | AI - KITT (Libsass 3.4.0) stable | -| 0.5.7 | Hancock - Optimise loops & Travis. Simplify changelog documentation | -| 0.5.6 | Green Giant - PHP5 & PHP7 stable build - All Travis builds passing | -| 0.5.5 | Herbie (Libsass 3.3.6) stable | -| 0.5.2 | Delorean (Libsass 3.3.3) stable & continuing PHP7 rewrite | -| 0.5.1 | Eleanor (Libsass 3.3.2) stable | -| 0.5.0 | Start of PHP 7 compatibility | -| 0.4.9 | Too Fast To Furious (Libsass 3.3.1) stable | -| 0.4.8 | Greased Lightning (Libsass 3.3.0) stable | -| 0.4.7 | SCSS vs SASS detection - indents | -| 0.4.6 | Travis experimental (unreleased) | -| 0.4.5 | Holiday Patch (Libsass 3.2.5) stable | -| 0.4.4 | Refactor correctly for LibSass 3.2.4 | -| 0.4.2 | CamelCase compile sequence | -| 0.4.1 | Addition of SOURCE_DEFAULT test & structure. Revise other tests | -| 0.4.0 | Refactor file compliation. Basic tests for source comments. Expand documentation | -| 0.3.9 | Addition of source map url paths to SASS file compilation | -| 0.3.5 | Restructure of compile sequence (file only at this time) to account for source map output | -| 0.3.0 | Addition of source comments - none, inline, file. Set default to none. | -| 0.2.0 | Changed methods to be non-static. Allow setting include-path and image-path | -| 0.1.0 | Initial release | +| Release | Description | +| ------- | ----------------------------------------------------------------------------------------- | +| 0.5.16 | Humpback - Maloo (Libsass 3.5.4) | +| 0.5.15 | Fallout - Atom (Libsass 3.5.2) | +| 0.5.14 | Karol - Caroline (Libsass 3.4.8) | +| 0.5.13 | Ray - Manta (Libsass 3.4.5) & PHP stub file | +| 0.5.12 | Cartography - MapRoot functions | +| 0.5.11 | Zoomer (Libsass 3.4.4) stable | +| 0.5.10 | Elwood (Libsass 3.4.3) stable & Travis fix | +| 0.5.9 | Rickshaw (Libsass 3.4.2) stable | +| 0.5.8 | AI - KITT (Libsass 3.4.0) stable | +| 0.5.7 | Hancock - Optimise loops & Travis. Simplify changelog documentation | +| 0.5.6 | Green Giant - PHP5 & PHP7 stable build - All Travis builds passing | +| 0.5.5 | Herbie (Libsass 3.3.6) stable | +| 0.5.2 | Delorean (Libsass 3.3.3) stable & continuing PHP7 rewrite | +| 0.5.1 | Eleanor (Libsass 3.3.2) stable | +| 0.5.0 | Start of PHP 7 compatibility | +| 0.4.9 | Too Fast To Furious (Libsass 3.3.1) stable | +| 0.4.8 | Greased Lightning (Libsass 3.3.0) stable | +| 0.4.7 | SCSS vs SASS detection - indents | +| 0.4.6 | Travis experimental (unreleased) | +| 0.4.5 | Holiday Patch (Libsass 3.2.5) stable | +| 0.4.4 | Refactor correctly for LibSass 3.2.4 | +| 0.4.2 | CamelCase compile sequence | +| 0.4.1 | Addition of SOURCE_DEFAULT test & structure. Revise other tests | +| 0.4.0 | Refactor file compliation. Basic tests for source comments. Expand documentation | +| 0.3.9 | Addition of source map url paths to SASS file compilation | +| 0.3.5 | Restructure of compile sequence (file only at this time) to account for source map output | +| 0.3.0 | Addition of source comments - none, inline, file. Set default to none. | +| 0.2.0 | Changed methods to be non-static. Allow setting include-path and image-path | +| 0.1.0 | Initial release | diff --git a/config.m4 b/config.m4 index e0a4934..fa058ab 100644 --- a/config.m4 +++ b/config.m4 @@ -14,7 +14,7 @@ if test "$PHP_SASS" != "no"; then if test "x$sass_version" != "x" ; then # escape hell. This is what we need to pass to the - # compiler: -DLIBSASS_VERSION="\"'3.5.2\"" + # compiler: -DLIBSASS_VERSION="\"'3.5.4\"" CFLAGS="-DLIBSASS_VERSION=\"\\\"$sass_version\\\"\" $CFLAGS" CXXFLAGS="-DLIBSASS_VERSION=\"\\\"$sass_version\\\"\" $CXXFLAGS" fi diff --git a/lib/libsass b/lib/libsass index 9cfe0df..1e52b74 160000 --- a/lib/libsass +++ b/lib/libsass @@ -1 +1 @@ -Subproject commit 9cfe0df975945325e05d6dd39ee98224898d9a79 +Subproject commit 1e52b74306b7d73a617396c912ca436dc55fd4d8 diff --git a/src/php_sass.h b/src/php_sass.h index 700917d..a7213cd 100644 --- a/src/php_sass.h +++ b/src/php_sass.h @@ -14,8 +14,8 @@ #include "config.h" #endif -#define SASS_VERSION "0.5.15" -#define SASS_FLAVOR "Sassyphpras" +#define SASS_VERSION "0.5.16" +#define SASS_FLAVOR "Sassyphpras" #include #include @@ -31,18 +31,17 @@ zend_class_entry *sass_exception_ce; zend_class_entry *sass_get_exception_base(); #ifdef PHP_WIN32 -# define PHP_SASS_API __declspec(dllexport) +#define PHP_SASS_API __declspec(dllexport) #elif defined(__GNUC__) && __GNUC__ >= 4 -# define PHP_SASS_API __attribute__ ((visibility("default"))) +#define PHP_SASS_API __attribute__((visibility("default"))) #else -# define PHP_SASS_API +#define PHP_SASS_API #endif #ifdef ZTS -# include "TSRM.h" +#include "TSRM.h" #endif - PHP_METHOD(Sass, __construct); PHP_METHOD(Sass, compile); PHP_METHOD(Sass, compileFile); diff --git a/tests/check_bundled_libsass_version.phpt b/tests/check_bundled_libsass_version.phpt index 07727f7..5b5567b 100644 --- a/tests/check_bundled_libsass_version.phpt +++ b/tests/check_bundled_libsass_version.phpt @@ -5,7 +5,7 @@ check bundled libsass version --FILE-- --EXPECT--