You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2018/09/11 21:48:13 UTC
[2/2] predictionio-sdk-php git commit: [PIO-163] Stack upgrade and
doc fix
[PIO-163] Stack upgrade and doc fix
Project: http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/commit/5de6751f
Tree: http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/tree/5de6751f
Diff: http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/diff/5de6751f
Branch: refs/heads/develop
Commit: 5de6751f1d97c340cd7468d6cd711efa106fa6f1
Parents: 4f3a6e9
Author: Donald Szeto <ds...@salesforce.com>
Authored: Tue Sep 11 14:47:20 2018 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Tue Sep 11 14:47:20 2018 -0700
----------------------------------------------------------------------
.gitignore | 1 -
.travis.yml | 3 +-
README.md | 23 +-
build.xml | 12 +-
composer.json | 9 +-
composer.lock | 3573 ++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 3603 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/blob/5de6751f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2ce022f..aeaa68d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
build
composer.phar
-composer.lock
docs
vendor
.idea
http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/blob/5de6751f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d8340d0..d8c9e70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
language: php
php:
+ - 7.2
+ - 7.1
- 7.0
- 5.6
- - 5.5
before_script:
- pear channel-discover pear.phing.info
- pear install phing/phing
http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/blob/5de6751f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d8f60f0..4dc3dd9 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# Apache PredictionIO PHP SDK
-
-[](https://travis-ci.org/apache/incubator-predictionio-sdk-php)
+[](https://travis-ci.org/apache/predictionio-sdk-php)
## Prerequisites
-* PHP 5.4+ (http://php.net/)
+* PHP 5.6+ (http://php.net/)
* PHP: cURL (http://php.net/manual/en/book.curl.php)
* Phing (http://www.phing.info/)
* ApiGen (http://apigen.org/)
@@ -14,9 +14,11 @@ Note: This SDK only supports Apache PredictionIO version 0.8.2 or higher.
## Getting Started
-The easiest way to install PredictionIO PHP client is to use [Composer](http://getcomposer.org/).
+The easiest way to install PredictionIO PHP client is to use
+[Composer](http://getcomposer.org/).
-1. `predictionio` is available on [Packagist](https://packagist.org) and can be installed using [Composer](https://getcomposer.org/):
+1. `predictionio` is available on [Packagist](https://packagist.org) and can be
+installed using [Composer](https://getcomposer.org/):
composer require predictionio/predictionio
@@ -75,19 +77,22 @@ print_r($response);
## Bugs and Feature Requests
-Use [Apache JIRA](https://issues.apache.org/jira/browse/PIO) to report bugs or request new features.
+Use [Apache JIRA](https://issues.apache.org/jira/browse/PIO) to report bugs or
+request new features.
## Community
Keep track of development and community news.
-* Subscribe to the user mailing list <ma...@predictionio.apache.org>
- and the dev mailing list <ma...@predictionio.apache.org>
+* Subscribe to the [user mailing
+ list](mailto:user-subscribe@predictionio.apache.org) and the [dev mailing
+ list](mailto:dev-subscribe@predictionio.apache.org).
* Follow [@PredictionIO](https://twitter.com/PredictionIO) on Twitter.
## Contributing
-Read the [Contribute Code](http://predictionio.apache.org/community/contribute-code/) page.
+Read the [Contribute
+Code](http://predictionio.apache.org/community/contribute-code/) page.
## License
http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/blob/5de6751f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4355efe..fdb6fcf 100644
--- a/build.xml
+++ b/build.xml
@@ -10,8 +10,10 @@
</then>
<else>
<echo message="Installing composer" />
- <exec command="curl -s http://getcomposer.org/installer | php" passthru="true" />
- <exec command="php composer.phar install --dev" passthru="true" />
+ <exec command="php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"" passthru="true" />
+ <exec command="php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"" passthru="true" />
+ <exec command="php composer-setup.php" passthru="true" />
+ <exec command="php -r "unlink('composer-setup.php');"" passthru="true" />
</else>
</if>
</target>
@@ -26,7 +28,11 @@
</target>
<target name="apigen">
- <exec command="apigen -s src -d docs --title 'PredictionIO API PHP Client'" passthru="true" />
+ <exec command="vendor/apigen/apigen/bin/apigen generate -s src -d docs --title 'PredictionIO API PHP Client'" passthru="true" />
+ </target>
+
+ <target name="test">
+ <exec command="vendor/phpunit/phpunit/phpunit" passthru="true" />
</target>
</project>
http://git-wip-us.apache.org/repos/asf/predictionio-sdk-php/blob/5de6751f/composer.json
----------------------------------------------------------------------
diff --git a/composer.json b/composer.json
index 570dac5..19b745d 100644
--- a/composer.json
+++ b/composer.json
@@ -15,17 +15,18 @@
"authors": [
{
"name": "Apache PredictionIO",
- "email": "user@predictionio.apache.org",
+ "email": "dev@predictionio.apache.org",
"homepage": "http://predictionio.apache.org"
}
],
"require": {
- "php": ">=5.5.0",
+ "php": ">=5.6.0",
"guzzlehttp/guzzle": "^6.1"
},
"require-dev": {
- "symfony/class-loader": "~2.3",
- "phpunit/phpunit": "^4.7"
+ "symfony/class-loader": "^2.3",
+ "phpunit/phpunit": "^4.7",
+ "apigen/apigen": "^4.1.2"
},
"autoload": {
"psr-4": {