phuby 1.0.0

data/lib/phuby/runtime.rb

@@ -0,0 +1,69 @@
+require 'singleton'
+require 'thread'
+
+module Phuby
+  class Runtime
+    include Singleton
+
+    attr_accessor :events
+
+    def self.php &block
+      instance.php(&block)
+    end
+
+    def initialize
+      @events       = Events.new
+      @mutex        = Mutex.new
+      @proxy_map    = {}
+    end
+
+    def started?
+      @mutex.locked?
+    end
+
+    def with_events event
+      old = @events
+      @events = event
+      yield self
+      @events = old
+    end
+
+    def eval string_or_io, filename = nil
+      raise NotStartedError, "please start the runtime" unless @mutex.locked?
+
+      if string_or_io.respond_to? :read
+        native_eval_io string_or_io, filename || string_or_io.path
+      else
+        native_eval string_or_io, filename || __FILE__
+      end
+    end
+
+    def php &block
+      start
+      block.call(self)
+    ensure
+      stop
+    end
+
+    def [] key
+      raise NotStartedError, "please start the runtime" unless @mutex.locked?
+      get key
+    end
+
+    def []= key, value
+      raise NotStartedError, "please start the runtime" unless @mutex.locked?
+      set key, value
+    end
+
+    class NotStartedError < RuntimeError; end
+
+    private
+    def call who, what, with
+      list = []
+      with.each do |obj|
+        list << obj
+      end
+      @proxy_map[who].send(what.to_sym, *list)
+    end
+  end
+end

data/php.patch

@@ -0,0 +1,145 @@
+diff --git configure configure
+index 365e20e..7d116ab 100755
+--- configure
++++ configure
+@@ -3480,7 +3480,7 @@ if test "$GCC" = "yes"; then
+     ;;
+   esac
+   if test $GCC_MAJOR_VERSION -ge 4; then
+-    CFLAGS="$CFLAGS -fvisibility=hidden"
++    CFLAGS="$CFLAGS"
+   fi
+ fi
+ 
+@@ -4406,12 +4406,12 @@ IFS="- /.
+     build_type=shared
+     ;;
+   *darwin*)
+-    MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
++    MH_BUNDLE_FLAGS="-dylib -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
+     
+   PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
+ 
+-    SAPI_SHARED=libs/libphp5.so
+-    build_type=bundle
++    SAPI_SHARED=libs/libphp5.dylib
++    build_type=shared
+     ;;
+   *)
+     build_type=shared
+@@ -107680,7 +107680,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+         archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      module_cmds='$CC $allow_undefined_flag -fPIC -o $lib -dynamiclib $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+       archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+diff --git configure.in configure.in
+index dff131d..18c8e72 100644
+--- configure.in
++++ configure.in
+@@ -427,6 +427,7 @@ alloca.h \
+ arpa/inet.h \
+ arpa/nameser.h \
+ assert.h \
++crt_externs.h \
+ crypt.h \
+ fcntl.h \
+ grp.h \
+diff --git ext/spl/spl_dllist.h ext/spl/spl_dllist.h
+index 5b0998b..8360282 100644
+--- ext/spl/spl_dllist.h
++++ ext/spl/spl_dllist.h
+@@ -24,9 +24,9 @@
+ #include "php.h"
+ #include "php_spl.h"
+ 
+-PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
+-PHPAPI zend_class_entry *spl_ce_SplQueue;
+-PHPAPI zend_class_entry *spl_ce_SplStack;
++extern PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
++extern PHPAPI zend_class_entry *spl_ce_SplQueue;
++extern PHPAPI zend_class_entry *spl_ce_SplStack;
+ 
+ PHP_MINIT_FUNCTION(spl_dllist);
+ 
+diff --git ext/spl/spl_fixedarray.h ext/spl/spl_fixedarray.h
+index dd556be..f9a2d90 100644
+--- ext/spl/spl_fixedarray.h
++++ ext/spl/spl_fixedarray.h
+@@ -22,7 +22,7 @@
+ #ifndef SPL_FIXEDARRAY_H
+ #define SPL_FIXEDARRAY_H
+ 
+-PHPAPI zend_class_entry *spl_ce_SplFixedArray;
++extern PHPAPI zend_class_entry *spl_ce_SplFixedArray;
+ 
+ PHP_MINIT_FUNCTION(spl_fixedarray);
+ 
+diff --git ext/spl/spl_heap.h ext/spl/spl_heap.h
+index 56c82b5..1d29e57 100644
+--- ext/spl/spl_heap.h
++++ ext/spl/spl_heap.h
+@@ -24,11 +24,11 @@
+ #include "php.h"
+ #include "php_spl.h"
+ 
+-PHPAPI zend_class_entry *spl_ce_SplHeap;
+-PHPAPI zend_class_entry *spl_ce_SplMinHeap;
+-PHPAPI zend_class_entry *spl_ce_SplMaxHeap;
++extern PHPAPI zend_class_entry *spl_ce_SplHeap;
++extern PHPAPI zend_class_entry *spl_ce_SplMinHeap;
++extern PHPAPI zend_class_entry *spl_ce_SplMaxHeap;
+ 
+-PHPAPI zend_class_entry *spl_ce_SplPriorityQueue;
++extern PHPAPI zend_class_entry *spl_ce_SplPriorityQueue;
+ 
+ PHP_MINIT_FUNCTION(spl_heap);
+ 
+diff --git main/php.h main/php.h
+index 58f4142..035d502 100644
+--- main/php.h
++++ main/php.h
+@@ -263,7 +263,13 @@ END_EXTERN_C()
+ #if !defined(PHP_WIN32)
+ #define PHP_SLEEP_NON_VOID
+ #define php_sleep sleep
++
++#if HAVE_CRT_EXTERNS_H
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
++#endif
+ #endif	/* !defined(PHP_WIN32) */
+ 
+ #ifdef PHP_PWRITE_64
+diff --git main/php_getopt.h main/php_getopt.h
+index 024ea5c..62f04d6 100644
+--- main/php_getopt.h
++++ main/php_getopt.h
+@@ -41,7 +41,7 @@ typedef struct _opt_struct {
+ 
+ BEGIN_EXTERN_C()
+ /* holds the index of the latest fetched element from the opts array */
+-PHPAPI int php_optidx;
++extern PHPAPI int php_optidx;
+ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err, int arg_start);
+ END_EXTERN_C()
+ 
+diff --git sapi/cli/config.m4 sapi/cli/config.m4
+index e804357..300b898 100644
+--- sapi/cli/config.m4
++++ sapi/cli/config.m4
+@@ -20,9 +20,6 @@ if test "$PHP_CLI" != "no"; then
+       BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+     fi
+     ;;
+-  *darwin*)
+-    BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+-    ;;
+   *netware*)
+     BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+     ;;

data/test/assets/hello_world.php

@@ -0,0 +1,6 @@
+<?php
+
+$hi = 'world';
+$my_file = __FILE__
+
+?>

data/test/assets/htdocs/index.php

@@ -0,0 +1,22 @@
+<html>
+  <head>
+    <title>
+Hello
+    </title>
+  </head>
+  <body>
+    <h1>Get Params</h1>
+    <table id="get">
+<?php
+      foreach($_GET as $key => $val) {
+?>
+      <tr>
+        <td><?php echo $key; ?></td>
+        <td><?php echo $val; ?></td>
+      </tr>
+<?php
+      }
+?>
+    </table>
+  </body>
+</html>

data/test/helper.rb

@@ -0,0 +1,19 @@
+#Process.setrlimit(Process::RLIMIT_CORE, Process::RLIM_INFINITY) unless RUBY_PLATFORM =~ /(java|mswin|mingw)/i
+
+require 'test/unit'
+require 'phuby'
+
+module Phuby
+  class TestCase < Test::Unit::TestCase
+    ASSETS_DIR      = File.join(File.dirname(__FILE__), 'assets')
+    HTDOCS_DIR      = File.join(File.dirname(__FILE__), 'assets', 'htdocs')
+
+    unless RUBY_VERSION >= '1.9'
+      undef :default_test
+    end
+
+    def setup
+      warn "#{name}" if ENV['TESTOPTS'] == '-v'
+    end
+  end
+end

data/test/test_array.rb

@@ -0,0 +1,101 @@
+require 'helper'
+
+class TestArray < Phuby::TestCase
+  def test_move_to_runtime
+    Phuby::Runtime.php do |rt|
+      rt['foo'] = [1,2,3]
+      assert_equal 1, rt['foo'][0]
+      assert_equal 2, rt['foo'][1]
+      assert_equal 3, rt['foo'][2]
+    end
+  end
+
+  def test_array_length
+    Phuby::Runtime.php do |rt|
+      rt.eval('$get_length = count($_GET);')
+      assert_equal rt['get_length'], rt['_GET'].length
+
+      10.times { |i|
+        rt.eval("$_GET['foo#{i}'] = 'bar'; $get_length = count($_GET);")
+        assert_equal rt['get_length'], rt['_GET'].length
+      }
+    end
+  end
+
+  def test_index_numeric_get
+    Phuby::Runtime.php do |rt|
+      rt.eval('$foo = array(1,2,3,4,5);')
+      list = []
+      assert_equal 1, rt['foo'][0]
+    end
+  end
+
+  def test_index_numeric_set
+    Phuby::Runtime.php do |rt|
+      rt.eval('$foo = array(1,2,3,4,5);')
+
+      rt['foo'][0] = "hello"
+
+      rt.eval('$bar = $foo[0];')
+
+      assert_equal 'hello', rt['bar']
+      assert_equal 'hello', rt['foo'][0]
+    end
+  end
+
+  def test_each
+    Phuby::Runtime.php do |rt|
+      rt.eval('$foo = array(1,2,3,4,5);')
+
+      array = rt['foo']
+
+      other = []
+      array.each do |thing|
+        other << thing
+      end
+      assert_equal [1,2,3,4,5], other
+    end
+  end
+
+  def test_to_a
+    Phuby::Runtime.php do |rt|
+      rt.eval('$foo = array(1,2,3,4,5);')
+
+      array = rt['foo']
+
+      assert_equal [1,2,3,4,5], array.to_a
+    end
+  end
+
+  def test_get
+    Phuby::Runtime.php do |rt|
+      rt.eval('$_GET["foo"] = "bar";')
+      #rt.eval('var_dump($_GET);')
+
+      assert_equal 'bar', rt['_GET']['foo']
+    end
+  end
+
+  def test_set
+    Phuby::Runtime.php do |rt|
+      rt['_GET']['foo'] = "bar"
+      rt.eval('$foo = $_GET["foo"];')
+      #rt.eval('var_dump($_GET);')
+
+      assert_equal 'bar', rt['foo']
+    end
+  end
+
+  def test_get_non_existent
+    Phuby::Runtime.php do |rt|
+      assert_nil rt['_GET']['foo']
+    end
+  end
+
+  def test_key?
+    Phuby::Runtime.php do |rt|
+      rt.eval('$_GET["foo"] = "bar";')
+      assert rt['_GET'].key? 'foo'
+    end
+  end
+end

data/test/test_handlers.rb

@@ -0,0 +1,49 @@
+require 'helper'
+
+class TestHeaderHandler < Phuby::TestCase
+  def setup
+    super
+    @rt = Phuby::Runtime.instance
+    @rt.start
+  end
+
+  def teardown
+    super
+    @rt.stop
+  end
+
+  def test_capture_output
+    quiet = Class.new(Phuby::Events) {
+      attr_accessor :written
+
+      def write string
+        @written ||= []
+        @written << string
+      end
+    }.new
+
+    @rt.with_events(quiet) do |rt|
+      rt.eval 'echo "hello world";'
+    end
+
+    assert_equal ['hello world'], quiet.written
+  end
+
+  def test_header_handler
+    header = Class.new(Phuby::Events) {
+      attr_accessor :headers
+
+      def header header, op
+        @headers ||= []
+        @headers << [header, op]
+      end
+    }.new
+
+    @rt.with_events(header) do |rt|
+      rt.eval 'setcookie("name", "Aaron", time()+3600);'
+    end
+
+    assert_equal 1, header.headers.length
+    assert_equal :store, header.headers.first.last
+  end
+end

data/test/test_header_sent.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class TestHeaderSent < Phuby::TestCase
+  def test_headers_sent
+    header = Class.new(Phuby::Events) {
+      attr_accessor :response_code
+
+      def send_headers response_code
+        @response_code = response_code
+      end
+    }.new
+
+    @rt = Phuby::Runtime.instance
+
+    @rt.start
+
+    @rt.events = header
+
+    @rt.eval 'header("foo: bar", true, 500);'
+
+    @rt.stop
+
+    assert_equal 500, header.response_code
+  end
+end

data/test/test_nil.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class TestNil < Phuby::TestCase
+  def test_nil_moves
+    Phuby::Runtime.php do |rt|
+      rt['foo'] = nil
+      assert_nil rt['foo']
+    end
+  end
+end