Merge branch 'php70_improvements' of https://github.com/Wikia/sassphp …

…into Wikia-php70_improvements # Conflicts: # src/sass.c
absalomedia · May 11, 2016 · e89298a · e89298a
2 parents f9ea8ae + 9c8988f
commit e89298a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-   PHP_VERSION: 5.6.16
+   PHP_VERSION: 5.6.21
 
 configuration: Release
 
@@ -17,12 +17,12 @@ install:
   - 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.16-src.zip -FileName php-src.zip
+  - 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.16-src
+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

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/src/sass.c b/src/sass.c
@@ -70,7 +70,7 @@ void sass_free_storage(void *object TSRMLS_DC)
     if (obj->map_root != NULL)
         efree(obj->map_root);
     zend_hash_destroy(obj->zo.properties);
-    FREE_HASHTABLE(obj->zo.properties);   
+    FREE_HASHTABLE(obj->zo.properties);
     efree(obj);
 }
 #endif
@@ -102,8 +102,8 @@ zend_object_value sass_create_handler(zend_class_entry *type TSRMLS_DC) {
 
 #if ZEND_MODULE_API_NO > 20131226
 zend_object * sass_create_handler(zend_class_entry *type TSRMLS_DC) {
-    struct sass_object *obj = ecalloc(1, 
-         sizeof(struct sass_object) + 
+    struct sass_object *obj = ecalloc(1,
+         sizeof(struct sass_object) +
          zend_object_properties_size(type));
 
      zend_object_std_init(&obj->zo, type TSRMLS_CC);
@@ -273,7 +273,7 @@ PHP_METHOD(Sass, compileFile)
         zend_throw_exception_ex(sass_exception_ce, 0 TSRMLS_CC, "File %s could not be found", file);
         RETURN_FALSE;
     }
-  
+
     struct Sass_File_Context* file_ctx = sass_make_file_context(file);
 
     struct Sass_Context* ctx = sass_file_context_get_context(file_ctx);
@@ -289,7 +289,7 @@ PHP_METHOD(Sass, compileFile)
     }
     else
     {
-        
+
         #if ZEND_MODULE_API_NO <= 20131226
         if (this->map_path != NULL ) {
         // Send it over to PHP.
@@ -339,7 +339,7 @@ PHP_METHOD(Sass, getStyle)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif 
+    #endif
 
     RETURN_LONG(obj->style);
 }
@@ -359,7 +359,7 @@ PHP_METHOD(Sass, setStyle)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif 
+    #endif
     obj->style = new_style;
 
     RETURN_NULL();
@@ -378,7 +378,7 @@ PHP_METHOD(Sass, getIncludePath)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     #if ZEND_MODULE_API_NO <= 20131226
     if (obj->include_paths == NULL) RETURN_STRING("", 1);
@@ -403,7 +403,6 @@ PHP_METHOD(Sass, setIncludePath)
     size_t path_len;
     #endif    
 
-
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) == FAILURE)
         RETURN_FALSE;
 
@@ -412,7 +411,7 @@ PHP_METHOD(Sass, setIncludePath)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     if (obj->include_paths != NULL)
         efree(obj->include_paths);
@@ -434,7 +433,7 @@ PHP_METHOD(Sass, getMapPath)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     #if ZEND_MODULE_API_NO <= 20131226
     if (obj->map_path == NULL) RETURN_STRING("", 1);
@@ -467,7 +466,7 @@ PHP_METHOD(Sass, setMapPath)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     if (obj->map_path != NULL)
         efree(obj->map_path);
@@ -490,7 +489,7 @@ PHP_METHOD(Sass, getPrecision)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     RETURN_LONG(obj->precision);
 }
@@ -510,7 +509,7 @@ PHP_METHOD(Sass, setPrecision)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif 
+    #endif
 
     obj->precision = new_precision;
 
@@ -530,7 +529,7 @@ PHP_METHOD(Sass, getEmbed)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     RETURN_LONG(obj->map_embed);
 }
@@ -550,7 +549,7 @@ PHP_METHOD(Sass, setEmbed)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     obj->map_embed = new_map_embed;
 
@@ -571,7 +570,7 @@ PHP_METHOD(Sass, getComments)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif 
+    #endif
 
     RETURN_LONG(obj->comments);
 }
@@ -591,7 +590,7 @@ PHP_METHOD(Sass, setComments)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif  
+    #endif
 
     obj->comments = new_comments;
 
@@ -612,7 +611,7 @@ PHP_METHOD(Sass, getIndent)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif 
+    #endif
 
     RETURN_LONG(obj->indent);
 }
@@ -632,7 +631,7 @@ PHP_METHOD(Sass, setIndent)
     #endif
     #if ZEND_MODULE_API_NO <= 20131226
     sass_object *obj = (sass_object *)zend_object_store_get_object(this TSRMLS_CC);
-    #endif 
+    #endif
 
     obj->indent = new_indent;
 
@@ -653,7 +652,7 @@ PHP_METHOD(Sass, getLibraryVersion)
     #if ZEND_MODULE_API_NO > 20131226
     RETURN_STRING(libsass_version());
     #endif
-    
+
 }
 /* --------------------------------------------------------------
  * EXCEPTION HANDLING