diff --git a/.gitignore b/.gitignore index 31103621c..bc959c533 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -/build /composer.lock -/ext/twig/autom4te.cache/ /phpunit.xml /vendor diff --git a/.travis.yml b/.travis.yml index 1c1148ffe..98a9fe682 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,8 @@ matrix: - php: hhvm-stable sudo: required dist: trusty - env: TWIG_EXT=no - php: 7.0 - env: TWIG_EXT=no - php: 7.1 - env: TWIG_EXT=no allow_failures: - php: hhvm-stable fast_finish: true @@ -27,7 +24,3 @@ before_install: install: - travis_retry composer install - -before_script: - - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi - - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi diff --git a/CHANGELOG b/CHANGELOG index 3fa874d9b..fca047a52 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ * 2.0.0 (2016-XX-XX) + * removed the C extension * moved Twig_Environment::getAttribute() to twig_get_attribute() * removed Twig_Environment::getLexer(), Twig_Environment::getParser(), Twig_Environment::getCompiler() * removed Twig_Compiler::getFilename() diff --git a/doc/installation.rst b/doc/installation.rst index 5cf56dbb5..430042bd4 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -30,60 +30,5 @@ Installing the development version git clone git://github.com/twigphp/Twig.git -Installing the C extension --------------------------- - -.. note:: - - The C extension is **optional** but it brings some nice performance - improvements. Note that the extension is not a replacement for the PHP - code; it only implements a small part of the PHP code to improve the - performance at runtime; you must still install the regular PHP code. - -Twig comes with a C extension that enhances the performance of the Twig -runtime engine; install it like any other PHP extensions: - -.. code-block:: bash - - cd ext/twig - phpize - ./configure - make - make install - -For Windows: - -1. Setup the build environment following the `PHP documentation`_ -2. Put Twig's C extension source code into ``C:\php-sdk\phpdev\vcXX\x86\php-source-directory\ext\twig`` -3. Use the ``configure --disable-all --enable-cli --enable-twig=shared`` command instead of step 14 -4. ``nmake`` -5. Copy the ``C:\php-sdk\phpdev\vcXX\x86\php-source-directory\Release_TS\php_twig.dll`` file to your PHP setup. - -.. tip:: - - For Windows ZendServer, ZTS is not enabled as mentioned in `Zend Server - FAQ`_. - - You have to use ``configure --disable-all --disable-zts --enable-cli - --enable-twig=shared`` to be able to build the twig C extension for - ZendServer. - - The built DLL will be available in - ``C:\\php-sdk\\phpdev\\vcXX\\x86\\php-source-directory\\Release`` - -Finally, enable the extension in your ``php.ini`` configuration file: - -.. code-block:: ini - - extension=twig.so #For Unix systems - extension=php_twig.dll #For Windows systems - -And from now on, Twig will automatically compile your templates to take -advantage of the C extension. Note that this extension does not replace the -PHP code but only provides an optimized version of the -``Twig_Template::getAttribute()`` method. - -.. _`download page`: https://github.com/twigphp/Twig/tags -.. _`Composer`: https://getcomposer.org/download/ -.. _`PHP documentation`: https://wiki.php.net/internals/windows/stepbystepbuild -.. _`Zend Server FAQ`: http://www.zend.com/en/products/server/faq#faqD6 +.. _`download page`: https://github.com/twigphp/Twig/tags +.. _`Composer`: https://getcomposer.org/download/