Browse code

feature #2318 removed remaining mentions of the C extension (fabpot)

This PR was merged into the 2.x branch.

Discussion
----------

removed remaining mentions of the C extension

Commits
-------

57ebf00 removed remaining mentions of the C extension

Fabien Potencier authored on 24/12/2016 10:36:01
Showing 4 changed files
... ...
@@ -1,5 +1,3 @@
1
-/build
2 1
 /composer.lock
3
-/ext/twig/autom4te.cache/
4 2
 /phpunit.xml
5 3
 /vendor
... ...
@@ -12,11 +12,8 @@ matrix:
12 12
         - php: hhvm-stable
13 13
           sudo: required
14 14
           dist: trusty
15
-          env: TWIG_EXT=no
16 15
         - php: 7.0
17
-          env: TWIG_EXT=no
18 16
         - php: 7.1
19
-          env: TWIG_EXT=no
20 17
     allow_failures:
21 18
         - php: hhvm-stable
22 19
     fast_finish: true
... ...
@@ -27,7 +24,3 @@ before_install:
27 24
 
28 25
 install:
29 26
     - travis_retry composer install
30
-
31
-before_script:
32
-    - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
33
-    - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
... ...
@@ -1,5 +1,6 @@
1 1
 * 2.0.0 (2016-XX-XX)
2 2
 
3
+ * removed the C extension
3 4
  * moved Twig_Environment::getAttribute() to twig_get_attribute()
4 5
  * removed Twig_Environment::getLexer(), Twig_Environment::getParser(), Twig_Environment::getCompiler()
5 6
  * removed Twig_Compiler::getFilename()
... ...
@@ -30,60 +30,5 @@ Installing the development version
30 30
 
31 31
     git clone git://github.com/twigphp/Twig.git
32 32
 
33
-Installing the C extension
34
-
35
-.. note::
36
-
37
-    The C extension is **optional** but it brings some nice performance
38
-    improvements. Note that the extension is not a replacement for the PHP
39
-    code; it only implements a small part of the PHP code to improve the
40
-    performance at runtime; you must still install the regular PHP code.
41
-
42
-Twig comes with a C extension that enhances the performance of the Twig
43
-runtime engine; install it like any other PHP extensions:
44
-
45
-.. code-block:: bash
46
-
47
-    cd ext/twig
48
-    phpize
49
-    ./configure
50
-    make
51
-    make install
52
-
53
-For Windows:
54
-
55
-1. Setup the build environment following the `PHP documentation`_
56
-2. Put Twig's C extension source code into ``C:\php-sdk\phpdev\vcXX\x86\php-source-directory\ext\twig``
57
-3. Use the ``configure --disable-all --enable-cli --enable-twig=shared`` command instead of step 14
58
-4. ``nmake``
59
-5. Copy the ``C:\php-sdk\phpdev\vcXX\x86\php-source-directory\Release_TS\php_twig.dll`` file to your PHP setup.
60
-
61
-.. tip::
62
-
63
-    For Windows ZendServer, ZTS is not enabled as mentioned in `Zend Server
64
-    FAQ`_.
65
-
66
-    You have to use ``configure --disable-all --disable-zts --enable-cli
67
-    --enable-twig=shared`` to be able to build the twig C extension for
68
-    ZendServer.
69
-
70
-    The built DLL will be available in
71
-    ``C:\\php-sdk\\phpdev\\vcXX\\x86\\php-source-directory\\Release``
72
-
73
-Finally, enable the extension in your ``php.ini`` configuration file:
74
-
75
-.. code-block:: ini
76
-
77
-    extension=twig.so #For Unix systems
78
-    extension=php_twig.dll #For Windows systems
79
-
80
-And from now on, Twig will automatically compile your templates to take
81
-advantage of the C extension. Note that this extension does not replace the
82
-PHP code but only provides an optimized version of the
83
-``Twig_Template::getAttribute()`` method.
84
-
85
-.. _`download page`:     https://github.com/twigphp/Twig/tags
86
-.. _`Composer`:          https://getcomposer.org/download/
87
-.. _`PHP documentation`: https://wiki.php.net/internals/windows/stepbystepbuild
88
-.. _`Zend Server FAQ`:   http://www.zend.com/en/products/server/faq#faqD6
33
+.. _`download page`: https://github.com/twigphp/Twig/tags
34
+.. _`Composer`:      https://getcomposer.org/download/