Skip to content

Commit 78f812b

Browse files
committed
Merge pull request mkschreder#14 from philippsimon/master
Fix for OS X, mocha tests & eslint added, general cleanup
2 parents 59aef24 + 019fcf2 commit 78f812b

File tree

11 files changed

+334
-210
lines changed

11 files changed

+334
-210
lines changed

.eslintrc.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"env": {
3+
"node": true
4+
},
5+
"extends": "eslint:recommended",
6+
"ignore": [
7+
"node_modules"
8+
],
9+
"rules": {
10+
"indent": [
11+
"error",
12+
2
13+
],
14+
"linebreak-style": [
15+
"error",
16+
"unix"
17+
],
18+
"quotes": [
19+
"error",
20+
"single"
21+
],
22+
"semi": [
23+
"error",
24+
"always"
25+
]
26+
}
27+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules/

COPYING renamed to LICENSE

File renamed without changes.

README.md

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
1-
<center>![Node PHP](https://raw2.github.com/mkschreder/siteboot_php/master/node_php_small.jpg)</center>
21
NodePHP - run wordpress (and other php scripts) with node
3-
---------------------------------
2+
---------------------------------------------------------
43

54
With Node PHP you can leverage the speed of node js and run all of the widely available php scripts directly inside your express site.
65

76
Installation
87
------------
98

10-
npm install node-php
11-
9+
```
10+
npm install node-php
11+
```
12+
1213
Usage
1314
-----
1415

1516
To run wordpress with node js and express do this:
1617

17-
var express = require('express');
18-
var php = require("node-php");
19-
var path = require("path");
20-
21-
var app = express();
22-
23-
app.use("/", php.cgi("/path/to/wordpress"));
18+
```javascript
19+
var express = require('express');
20+
var php = require("node-php");
21+
var path = require("path");
22+
23+
var app = express();
24+
25+
app.use("/", php.cgi("/path/to/wordpress"));
2426

25-
app.listen(9090);
27+
app.listen(9090);
2628

27-
console.log("Server listening!");
29+
console.log("Server listening!");
30+
```
2831

2932
Explanation
3033
-----------
@@ -41,24 +44,6 @@ Dependencies
4144
License
4245
-------
4346

44-
This software is distributed under MIT license.
45-
46-
Copyright (c) 2014-2016 Martin K. Schröder <[email protected]>
47-
48-
Permission is hereby granted, free of charge, to any person obtaining a copy
49-
of this software and associated documentation files (the "Software"), to deal
50-
in the Software without restriction, including without limitation the rights
51-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
52-
copies of the Software, and to permit persons to whom the Software is
53-
furnished to do so, subject to the following conditions:
54-
55-
The above copyright notice and this permission notice shall be included in all
56-
copies or substantial portions of the Software.
47+
Copyright © 2014-2016 Martin K. Schröder <[email protected]>
5748

58-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
59-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
60-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
61-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
62-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
63-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
64-
SOFTWARE.
49+
The MIT License (MIT) - See [LICENSE](./LICENSE) for further details.

0 commit comments

Comments
 (0)