sensational · absalomedia · Jul 15, 2015 · Jul 15, 2015 · Jul 15, 2015 · Aug 7, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,75 @@
+language: php
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - nightly
+
+allow_failures:
+    - php: nightly
+
+addons:
+  apt:
+    packages:
+      - php5-dev
+      - gdb
+
+env:
+  global:
+    # Configure the .phpt tests to be Travis friendly
+    - REPORT_EXIT_STATUS=1
+    - TEST_PHP_ARGS="-q -s output.txt -g XFAIL,FAIL,BORK,WARN,LEAK,SKIP -x --show-diff"
+    # Add the pip installation folder to the PATH, until https://github.com/travis-ci/travis-ci/issues/3563 is fixed
+    - PATH=$HOME/.local/bin:$PATH
+
+compiler:
+  - gcc
+
+install:
+ # What is the current file size max for core files?
+ # It is usually 0, which means no core file will be dumped if there is a crash 
+ - ulimit -c
+
+before_install:
+  - echo $LANG
+  - echo $LC_ALL
+  - composer require satooshi/php-coveralls --dev
+  - git submodule init
+  - git submodule update
+
+before_script:
+  - travis_retry composer self-update
+  - composer config discard-changes true
+  - ulimit -c unlimited -S       # enable core dumps
+
+script:
+  - make clean
+  - cd lib/libsass && make && cd ../..
+  - phpize
+  - ./configure
+  - make
+  - echo "extension = sass.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TRAVIS_BUILD_DIR}/modules"
+  - make install
+  - mkdir -p build/logs
+  - phpunit --coverage-clover build/logs/clover.xml
+  - make test || RESULT=$?
+  - if [[ ${RESULT} == 0 ]]; then echo "\\o/ our test worked without problems"; else echo "ruhroh test returned an errorcode of $RESULT"; fi;
+  - for i in $(find ./ -maxdepth 1 -name 'core*' -print); do gdb $(pwd)/test core* -ex "thread apply all bt" -ex "set pagination 0" -batch; done;
+  - if [[ ${RESULT} != 0 ]]; then exit $RESULT ; fi;
+
+after_success:
+  - travis_retry php vendor/bin/coveralls
+
+notifications:
+    on_success: never
+    on_failure: never
+
+
+os:
+  - linux
+
+matrix:
+  fast_finish: true
diff --git a/README.md b/README.md
@@ -2,19 +2,21 @@
 
 The `sass` extension for PHP gives you an object-oriented system of parsing [Sass](http://sass-lang.com/) from within your PHP applications. Under the hood it uses [libsass](https://github.com/hcatlin/libsass) to provide super speedy and compatible Sass parsing.
 
+![Libsass 3.4.3](https://img.shields.io/badge/libsass-3.4.3-yellow.svg) [![Build Status](https://travis-ci.org/absalomedia/sassphp.svg)](https://travis-ci.org/absalomedia/sassphp)
+
 ## What's Sass?
 
 Sass is a CSS pre-processor language to add on exciting, new, awesome features to CSS. Sass was the first language of its kind and by far the most mature and up to date codebase.
 
-Sass was originally created by Hampton Catlin ([@hcatlin](http://twitter.com/hcatlin)). The extension and continuing evolution of the language has all been the result of years of work by Natalie Weizenbaum ([@nex4](http://twitter.com/nex4)) and Chris Eppstein ([@chriseppstein](http://twitter.com/chriseppstein)).
+Sass was originally created by Hampton Catlin ([@hcatlin](http://twitter.com/hcatlin)). The extension and continuing evolution of the language has all been the result of years of work by Natalie Weizenbaum ([@nex3](http://twitter.com/nex3)) and Chris Eppstein ([@chriseppstein](http://twitter.com/chriseppstein)).
 
 For more information about Sass itself, please visit [http://sass-lang.com](http://sass-lang.com)
 
 ## Installation
 
 Currently, the only way to install the extension is manually:
 
-    $ git clone git://github.com/absalomedia/sassphp
+    $ git clone git://github.com/sensational/sassphp
 
 Remember to grab your submodules:
 
@@ -71,17 +73,20 @@ You can set the style of your SASS file to suit your needs:
     $sass = new Sass();
     $sass->setStyle(Sass::STYLE_COMPRESSED);
 
-The new additions to this build from the [Sensational](https://github.com/sensational/sassphp) codebase are:
-* Camel case rename of `compile_file` to `compileFile`
-* SASS file compilation is now an array when a source map is enabled. Otherwise, as per normal, it's a string.
+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
+* The ability to specify .SASS file input instead of .SCSS
 * The ability to set a source map path, required when generating a dedicated .map file
+* The ability to define a root directory for the source map itself
+* PHP 5.4 to PHP 7.1 (nightly) support
 
-It also reports itself as the `Sassyphpras` version of the Apache SASS module to help differentiate builds.
+The output of `compileFile()` is an array when creating source map files, allowing both compiled SASS file and .map file to be generated in the same function call.
 
-The output of `compileFile()` is now an array instead of a string, allowing both compiled SASS file and .map file to be generated in the same function call. As there are multiple ways of generating source comments, there are now PHP level settings to control that output.
+As there are multiple ways of generating source comments, there are now PHP level settings to control that output.
 
-To generate source comments for a file inline - now in camelCase:
+To generate source comments for a file inline:
 
     $sass = new Sass();
     $sass->setComments(true);
@@ -91,10 +96,21 @@ Aliases also exist so you can also use:
 
     $css = $sass->compile_file($source);
 
+You can tell the compiler to use indented syntax (SASS syntax). By default it expects SCSS syntax:
+
+    $sass = new Sass();
+    $sass->setIndent(true); //TRUE -> SASS, FALSE -> SCSS
+    $css = $sass->compile($source);
+
+You can tell the compiler to embed the source map into the actual CSS file as well:
+
+    $sass = new Sass();
+    $sass->setEmbed(true);
+    $css = $sass->compile($source);
+
 You can set the source map file for the library to use:
 
     $sass = new Sass();
-    $sass->setComments(true);
     $sass->setMapPath('/random.output.css.map');
     $css = $sass->compileFile($source);
 
@@ -106,6 +122,13 @@ The first array item will always be the compiled SASS file:
 The second array item will always be the source map output:
     $css[1]
 
+You can set the root of the generated source map file like so:
+
+    $sass = new Sass();
+    $sass->setMapRoot('/some/dir');
+    $sass->setMapPath('/random.output.css.map');
+    $css = $sass->compileFile($source);
+
 If there's a problem, the extension will throw a `SassException`:
 
     $sass = new Sass();
@@ -121,50 +144,37 @@ If there's a problem, the extension will throw a `SassException`:
         $css = FALSE;
     }
 
-## Potential / known issues
-
-* The file_comments test will fail as it remains unable to figure out the path the test has been run in. It generates the output successfully
-
+## Variant builds
 
-## Forward planning
+These extensions also utilise the [Libsass](https://github.com/hcatlin/libsass) library & remain in varying states of completion:
 
-* HHVM Zend compatibility?
-* Nginx extension?
+* Facebook [HHVM](https://github.com/absalomedia/sasshhvm) native (non Zend) extension - with Libsass 3.4.3 - tested up to HHVM 3.11.x
+* [Nginx](https://github.com/absalomedia/sass-nginx-module) module - with Libsass 3.4.3
 
 ## Changelog
 
-** Version 0.4.5 
-* Holiday Patch (Libsass 3.2.5) stable
-
-** Version 0.4.4 
-* Refactor correctly for LibSass 3.2.4
-
-** Version 0.4.2
-* CamelCase compile sequence
-
-** Version 0.4.1**
-* SOURCE_DEFAULT works & is documented
-* PHP test for SOURCE_DEFAULT (output unable to understand source directory in test, so functional pass, technical fail)
-* Revise other tests to pass as output varies on source negotiation.
-
-** Version 0.4**
-* Reconciled file compliation loop
-* Expand documentation
-* Addition of basic test for source comments
-* More work on compile sequence
-
-** Version 0.3.9**
-* Addition of source map url paths to SASS file compilation
-
-** Version 0.3.5**
-* Restructure of compile sequence (file only at this time) to account for source map output
-
-** Version 0.3.0**
-* Addition of source comments - none, inline, file. Set default to none.
-
-** Version 0.2.0**
-* Changed methods to be non-static
-* Allow setting include-path and image-path
-
-**Version 0.1.0 - IN DEVELOPMENT**
-* Initial release
+| Release | Description |
+| --- | --- |
+| 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/appveyor.yml b/appveyor.yml
@@ -0,0 +1,42 @@
+environment:
+   PHP_VERSION: 5.6.21
+
+configuration: Release
+
+version: '0.0.{build}'
+
+matrix:
+  fast_finish: true
+
+install:
+  - cd C:\projects\sassphp
+  - git submodule init
+  - git submodule update
+  - cd C:\
+  - mkdir php-src
+  - echo Preparing Windows build...
+  - echo Downloading PHP source code [%PHP_VERSION%]
+  - cd C:\php-src
+  - appveyor DownloadFile http://windows.php.net/downloads/releases/php-5.6.21-src.zip -FileName php-src.zip
+  - 7z x -y php-src.zip > nul
+  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64'
+
+build_script:
+  - cd C:\php-src\php-5.6.21-src
+  - buildconf.bat --add-modules-dir=C:\projects
+  - configure --disable-all --enable-cli --enable-sass
+  - nmake php_sass.dll
+
+test: OFF
+
+test_script: OFF
+
+deploy: OFF
+
+notifications:
+  - on_build_success: false
+    on_build_failure: false
+    on_build_status_changed: false
+
+artifacts:
+  - path: ext\Release_TS\php_sass.dll
diff --git a/config.m4 b/config.m4
@@ -2,6 +2,7 @@ PHP_ARG_ENABLE(sass, [whether to enable sass extension],
 [  --enable-sass      Enable sass extension], yes, yes)
 
 if test "$PHP_SASS" != "no"; then
+  PHP_ADD_INCLUDE(lib/libsass/include)
   PHP_ADD_LIBRARY_WITH_PATH(sass, lib/libexec, LIBSASS_SHARED_LIBADD)
 
   LDFLAGS="-lsass -L"`pwd`"/lib/libsass/lib/ -lstdc++"
@@ -13,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.2.5\""
+      #  compiler: -DLIBSASS_VERSION="\"'3.3.3\""
       CFLAGS="-DLIBSASS_VERSION=\"\\\"$sass_version\\\"\" $CFLAGS"
       CXXFLAGS="-DLIBSASS_VERSION=\"\\\"$sass_version\\\"\" $CXXFLAGS"
   fi

diff --git a/install.php b/install.php
@@ -4,4 +4,4 @@
 system('cd lib/libsass && make && cd ../..');
 system('phpize');
 system('./configure');
-system('make');
+system('make');
diff --git a/lib/libsass b/lib/libsass
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    forceCoversAnnotation="true"
+    mapTestClassNameToCoveredClassName="true"
+    colors="true"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    syntaxCheck="false"
+    stopOnError="false"
+>
+
+    <testsuites>
+        <testsuite name="PHPT Test suite">
+             <directory suffix=".phpt">./tests/</directory>
+        </testsuite>
+   </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+             <directory suffix=".phpt">./tests/</directory>
+        </whitelist>
+        <blacklist>
+            <directory>./tests</directory>
+            <directory>./vendor/</directory>
+        </blacklist>
+    </filter>
+   <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    </logging>  
+</phpunit>
diff --git a/src/php_sass.h b/src/php_sass.h
@@ -4,6 +4,7 @@
  *
  * https://github.com/jamierumbelow/sassphp
  * Copyright (c)2012 Jamie Rumbelow <http://jamierumbelow.net>
+ * with work done by Philip Hofstetter & Lawrence Meckan
  */
 
 #ifndef PHP_SASS_H
@@ -13,15 +14,15 @@
 #include "config.h"
 #endif
 
-#define SASS_VERSION "0.4.5"
-#define SASS_FLAVOR  "Sassyphpras"
+#define SASS_VERSION "0.5.10"
+#define SASS_FLAVOR  "sensational"
 
 #include <php.h>
 #include <ext/standard/info.h>
 #include <Zend/zend_extensions.h>
 #include <Zend/zend_exceptions.h>
 
-#include "lib/libsass/sass_context.h"
+#include <sass.h>
 
 zend_class_entry *sass_ce;
 zend_class_entry *sass_exception_ce;
@@ -39,6 +40,8 @@ PHP_METHOD(Sass, getPrecision);
 PHP_METHOD(Sass, setPrecision);
 PHP_METHOD(Sass, getComments);
 PHP_METHOD(Sass, setComments);
+PHP_METHOD(Sass, getIndent);
+PHP_METHOD(Sass, setIndent);
 PHP_METHOD(Sass, getEmbed);
 PHP_METHOD(Sass, setEmbed);
 PHP_METHOD(Sass, getMapPath);