Commit ec9b4d0

committed

Merge branch 'master' into stable

2 parents 6092278 + 7038cc8 commit ec9b4d0Copy full SHA for ec9b4d0

File tree

+367

-77

lines changed

+367

-77

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`# Use this only in a development environment`
`2`	`2`
`3`	`3`	`# PHP-Built-in-web-server-Router`
	`4`	`+![PHP-Built-in-web-server-Router](./src/php_5.png)`
`4`	`5`
`5`	`6`	`This library comes with caching support for [PHP built-in web-server](http://php.net/manual/en/features.commandline.webserver.php)`
`6`	`7`
`@@ -101,8 +102,8 @@ return $php_web_server->listen();`
`101`	`102`	```
`102`	`103`
`103`	`104`	`# Notes`
`104`		`-I've tested this with simple php files and the following php frameworks:`
`105`		`-* Yii2 ( i know Yii2 has [it's own webserver](http://www.yiiframework.com/wiki/819/php-built-in-server-integration/), but it doesn't have caching support unfortunately )`
	`105`	`+I've tested this with the following php frameworks:`
	`106`	`+* Yii2`
`106`	`107`	`* CodeIgniter 3`
`107`	`108`	`* Wordpress`
`108`	`109`	`* Drupal 7 and 8`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`</head>`
`12`	`12`	`<?php`
`13`	`13`	`$bing = json_decode(file_get_contents("http://www.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=en-US"), true);`
`14`		`-$image = '//bing.com/' . $bing["images"][0]["url"];`
	`14`	`+$image = '//www.bing.com/' . $bing["images"][0]["url"];`
`15`	`15`	`?>`
`16`	`16`	`<body style="background:url('<?php echo $image ?>')">`
`17`	`17`	`<div class="main">`
`@@ -30,4 +30,4 @@`
`30`	`30`
`31`	`31`	`</div>`
`32`	`32`	`</body>`
`33`		`-</html>`
	`33`	`+</html>`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`	`"description": "A router library for your PHP Built-in Webserver.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
`7`		`- "start-default": "php -S 0.0.0.0:9000 src/router.php",`
`8`		`- "start-codeigniter": "php -S 0.0.0.0:9001 -t ./codeigniter src/router.php",`
`9`		`- "start-yii": "php -S 0.0.0.0:9002 -t ./yii/web src/router.php",`
`10`		`- "start-wordpress": "php -S 0.0.0.0:9003 -t ./wordpress src/router.php",`
`11`		`- "start-wordpress48": "php -S 0.0.0.0:9004 -t ./wordpress48 src/router.php",`
`12`		`- "start-drupal7": "php -S 0.0.0.0:9005 -t ./drupal7 src/router.php",`
	`7`	`+ "start-default": "php -d max_execution_time=280 -S 0.0.0.0:9000 ./src/router.php",`
	`8`	`+ "start-codeigniter": "php -d max_execution_time=280 -S 0.0.0.0:9001 -t ./codeigniter src/router.php",`
	`9`	`+ "start-yii": "php -d max_execution_time=280 -S 0.0.0.0:9002 -t ./yii/web src/router.php",`
	`10`	`+ "start-wordpress": "php -d max_execution_time=280 -S 0.0.0.0:9003 -t ./wordpress src/router.php",`
	`11`	`+ "start-wordpress48": "php -d max_execution_time=280 -S 0.0.0.0:9004 -t ./wordpress48 src/router.php",`
	`12`	`+ "start-drupal7": "php -d max_execution_time=280 -S 0.0.0.0:9005 -t ./drupal7 src/router.php",`
`13`	`13`	`"start-drupal8": "php -d max_execution_time=280 -S 0.0.0.0:9006 -t ./drupal8 src/router.php",`
`14`	`14`	`"test-router-path": "node ./test/routerPath.js"`
`15`	`15`	`},`

8.5 KB

Comments

(0)