Merge branch 'master' of https://github.com/izniburak/php-router

Author: izniburak

.travis.yml

@@ -1,24 +1,36 @@
 language: php
 
-dist: trusty
-
 matrix:
   include:
   - php: 5.5
+    dist: trusty
   - php: 5.6
   - php: 7.0
   - php: 7.1
   - php: 7.2
   - php: 7.3
   - php: 7.4
 
-sudo: false
+sudo: required
 
 install:
   - composer install
 
 before_script:
-  - php -S localhost:5000 tests/fixtures/server.php &
+  - sudo apt-get update
+  - sudo apt-get install -y apache2 libapache2-mod-fastcgi
+  # enable php-fpm
+  - if [[ ${TRAVIS_PHP_VERSION:0:1} == "7" ]]; then sudo cp tests/fixtures/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:1} == "5" ]]; then sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; fi
+  - sudo a2enmod rewrite actions fastcgi alias
+  - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
+  - sudo chown -R travis:travis /var/lib/apache2/fastcgi
+  - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+  # configure apache virtual hosts
+  - sudo cp -f tests/fixtures/travis-ci-apache /etc/apache2/sites-available/000-default.conf
+  - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
+  - sudo service apache2 restart
 
 script:
   - vendor/bin/phpunit

tests/RouterTest.php

@@ -35,7 +35,7 @@ protected function tearDown()
 
     public function testGetIndexRoute()
     {
-        $request = $this->client->createRequest('GET', 'http://localhost:5000/');
+        $request = $this->client->createRequest('GET', 'http://localhost/tests/fixtures/');
         $response = $this->client->send($request);
 
         $this->assertSame('Hello World!', (string) $response->getBody());
@@ -46,13 +46,13 @@ public function testGetIndexRoute()
      */
     public function testGetNotFoundRoute()
     {
-        $request = $this->client->createRequest('GET', 'http://localhost:5000/not/found');
+        $request = $this->client->createRequest('GET', 'http://localhost/tests/fixtures/not/found');
         $response = $this->client->send($request);
     }
 
     public function testGetControllerRoute()
     {
-        $request = $this->client->createRequest('GET', 'http://localhost:5000/controllers');
+        $request = $this->client->createRequest('GET', 'http://localhost/tests/fixtures/controller');
         $response = $this->client->send($request);
 
         $this->assertSame('controller route', (string) $response->getBody());

tests/bootstrap.php

@@ -0,0 +1,5 @@
+RewriteEngine On
+RewriteBase /tests/fixtures
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^ index.php [QSA,L]

tests/fixtures/.htaccess

@@ -21,6 +21,6 @@
     return 'Hello World!';
 });
 
-$router->get('/controllers', 'TestController@main');
+$router->get('/controller', 'TestController@main');
 
 $router->run();

tests/fixtures/server.php renamed to tests/fixtures/index.php

@@ -0,0 +1,21 @@
+<VirtualHost *:80>
+  DocumentRoot %TRAVIS_BUILD_DIR%
+
+  <Directory "%TRAVIS_BUILD_DIR%">
+    Options FollowSymLinks MultiViews ExecCGI
+    AllowOverride All
+    Require all granted
+  </Directory>
+
+  # Wire up Apache to use Travis CI's php-fpm.
+  <IfModule mod_fastcgi.c>
+    AddHandler php-fcgi .php
+    Action php-fcgi /php-fcgi
+    Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
+    FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host 127.0.0.1:9000 -pass-header Authorization
+
+    <Directory /usr/lib/cgi-bin>
+      Require all granted
+    </Directory>
+  </IfModule>
+</VirtualHost>