Merge pull request #25 from pinepain/improve-api

Improve api

Author: pinepain

CMakeLists.txt

@@ -3,8 +3,8 @@ project(php_v8)
 
 # NOTE: This CMake file is just for syntax highlighting in CLion
 
-include_directories(/usr/local/opt/v8@5.9/include)
-include_directories(/usr/local/opt/v8@5.9/include/libplatform)
+include_directories(/usr/local/opt/v8@6.0/include)
+include_directories(/usr/local/opt/v8@6.0/include/libplatform)
 
 include_directories(/usr/local/include/php)
 include_directories(/usr/local/include/php/TSRM)

config.m4

@@ -149,6 +149,7 @@ if test "$PHP_V8" != "no"; then
   PHP_NEW_EXTENSION(v8, [                                 \
     v8.cc                                                 \
     src/php_v8_a.cc                                       \
+    src/php_v8_enums.cc                                   \
     src/php_v8_exception.cc                               \
     src/php_v8_ext_mem_interface.cc                       \
     src/php_v8_try_catch.cc                               \
@@ -169,7 +170,6 @@ if test "$PHP_V8" != "no"; then
     src/php_v8_script.cc                                  \
     src/php_v8_unbound_script.cc                          \
     src/php_v8_cached_data.cc                             \
-    src/php_v8_compile_options.cc                         \
     src/php_v8_script_compiler.cc                         \
     src/php_v8_source.cc                                  \
     src/php_v8_data.cc                                    \
@@ -184,7 +184,6 @@ if test "$PHP_V8" != "no"; then
     src/php_v8_integer.cc                                 \
     src/php_v8_int32.cc                                   \
     src/php_v8_uint32.cc                                  \
-    src/php_v8_integrity_level.cc                         \
     src/php_v8_object.cc                                  \
     src/php_v8_function.cc                                \
     src/php_v8_array.cc                                   \
@@ -196,17 +195,13 @@ if test "$PHP_V8" != "no"; then
     src/php_v8_boolean_object.cc                          \
     src/php_v8_string_object.cc                           \
     src/php_v8_symbol_object.cc                           \
-    src/php_v8_property_attribute.cc                      \
     src/php_v8_template.cc                                \
     src/php_v8_return_value.cc                            \
     src/php_v8_callback_info.cc                           \
     src/php_v8_function_callback_info.cc                  \
     src/php_v8_property_callback_info.cc                  \
-    src/php_v8_access_control.cc                          \
-    src/php_v8_property_handler_flags.cc                  \
     src/php_v8_named_property_handler_configuration.cc    \
     src/php_v8_indexed_property_handler_configuration.cc  \
-    src/php_v8_access_type.cc                             \
   ], $ext_shared, , -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
   PHP_ADD_BUILD_DIR($ext_builddir/src)

scripts/provision/.bashrc

@@ -127,4 +127,7 @@ if [[ -e ~/.phpbrew/bashrc ]]; then
     fi
 fi
 
-EDITOR=vim
+export EDITOR=vim
+
+# To prevent a PHP test suite from asking to send results to the PHP QA team:
+export NO_INTERACTION=1

scripts/provision/provision.sh

@@ -10,6 +10,10 @@ sudo add-apt-repository ppa:pinepain/libv8-6.0
 # Let's update packages list:
 sudo apt-get update
 
+# Remove unused
+sudo apt-get remove -y liblxc1 lxc-common lxd lxcfs
+
+
 # Make sure this system tools installed:
 sudo apt-get install -y git htop curl pkgconf
 

scripts/replace_expect.php

@@ -13,7 +13,15 @@
  */
 
 $tests_dir = realpath(__DIR__ . '/../tests');
-$iterator = new GlobIterator($tests_dir . '/*.out', FilesystemIterator::KEY_AS_FILENAME);
+
+
+if ($argc == 2) {
+    $mask = str_replace(['tests/', '.phpt', '.diff'], '', $argv[1]);
+} else {
+    $mask = '*';
+}
+
+$iterator = new GlobIterator($tests_dir . "/{$mask}.out", FilesystemIterator::KEY_AS_FILENAME);
 
 foreach ($iterator as $item) {
     //var_dump($item);
@@ -35,7 +43,42 @@
         foreach (['.diff', '.exp', '.log', '.mem', '.out', '.php', '.sh'] as $ext) {
             @unlink($tests_dir. '/'.$base_name . $ext);
         }
-    } else {
-        printf("please, edit manually [%s]".PHP_EOL, $iterator->key());
+
+        continue;
+    } elseif (false !== ($pos = strpos($test_content, '--EXPECTF--'))) {
+
+        printf("--EXPECTF--  [%s]".PHP_EOL, $iterator->key());
+
+        // get replacements
+
+        $tests = substr($test_content, 0, $pos);
+        $result = file_get_contents($tests_dir . '/' . $out_file);
+
+        preg_match_all('#// EXPECTF: \-\-\-(.+)#', $tests, $expectf_search);
+        preg_match_all('#// EXPECTF: \+\+\+(.+)#', $tests, $expectf_replace);
+
+        if (count($expectf_search) != count($expectf_replace)) {
+            printf("please, edit manually [%s]: searches and replaces count doesn't match".PHP_EOL, $iterator->key());
+            continue;
+        }
+
+        foreach (array_combine($expectf_search[1], $expectf_replace[1]) as $search => $replace) {
+            $result = preg_replace($search, $replace, $result);
+        }
+
+        $test_content = $tests;
+        $test_content .= '--EXPECTF--'.PHP_EOL;
+        $test_content .= $result;
+        $test_content .= PHP_EOL;
+
+        file_put_contents($tests_dir . '/' . $test_file, $test_content);
+
+        foreach (['.diff', '.exp', '.log', '.mem', '.out', '.php', '.sh'] as $ext) {
+            @unlink($tests_dir. '/'.$base_name . $ext);
+        }
+
+        continue;
     }
+
+    printf("please, edit manually [%s]".PHP_EOL, $iterator->key());
 }