Merge branch 'develop' for Release 1.1

Author: Chris Park

.travis.yml

@@ -1,16 +1,14 @@
 language: php
-# Handle git submodules yourself
-git:
-    submodules: false
-# Use sed to replace the SSH URL with the public URL, then initialize submodules
 before_install:
 php:
   - 5.5
   - 5.6
+  - 7.0
 before_script:
   - composer self-update
   - composer install --prefer-source --no-interaction --dev
-script: phpunit --bootstrap ./vendor/autoload.php ./tests/rosette/api/ApiTest.php
+script:
+    - bin/phpspec run --config=phpspec.yml --bootstrap=./vendor/autoload.php --no-interaction --format=pretty
 
 notifications:
   slack:

README.md

@@ -9,7 +9,7 @@ See the [wiki](https://github.com/rosette-api/php/wiki) for more information.
 Installation
 ------------
 
-`composer require "rosette/api: ~1.0.*"`
+`composer require "rosette/api: ~1.1.*"`
 
 Basic Usage
 -----------

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "rosette/api",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Rosette API PHP client SDK",
   "license": "Apache",
   "keywords": [
@@ -15,17 +15,15 @@
       "homepage": "https://developer.rosette.com"
     }
   ],
-  "require": {
-    "php": ">=5.5"
-  },
   "require-dev": {
-    "phpunit/phpunit": ">=4.6",
     "fabpot/php-cs-fixer": ">=1.9",
-    "kherge/box": "~2.0",
-    "symfony/finder": "~2.7",
-    "phpdocumentor/phpdocumentor": "~2.8"
+    "phpdocumentor/phpdocumentor": "~2.8",
+    "phpspec/phpspec": "~2.5"
+  },
+  "config": {
+    "bin-dir": "bin"
   },
   "autoload": {
-    "psr-4": {"rosette\\api\\": "./source/rosette/api"}
+    "psr-4": {"rosette\\": "./source/rosette"}
   }
 }

docker/Dockerfile

@@ -1,23 +1,38 @@
-FROM php:5.5-cli
+FROM phusion/baseimage
 MAINTAINER Fiona Hasanaj
 ENV TZ=America/New_York
 
 # install necessary software
-RUN apt-get -y update && apt-get install -y vim  && apt-get install -y git && apt-get install -y libxslt1-dev
+
+RUN apt-get -y update && apt-get install -y \
+    git \
+    language-pack-en-base \
+    libxslt1-dev \
+    python-software-properties \
+    vim \
+    wget
+
+RUN LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php5-5.6
+RUN apt-get -y update && apt-get install -y \
+    php5-dev \
+    php5-cli \
+    php5-curl \
+    php5-xsl \
+    libapache2-mod-php5
+
+
+RUN echo "memory_limit=-1" >> /etc/php5/cli/php.ini && \
+    echo "date.timezone=America/New_York" >> /etc/php5/cli/php.ini
+
+RUN wget -O /usr/local/bin/composer https://getcomposer.org/composer.phar && \
+    chmod +x /usr/local/bin/composer
 
 # copy over the necessary files
+RUN mkdir /php-dev && mkdir /php-dev/tests
 COPY composer.json /php-dev/composer.json
 WORKDIR /php-dev
 
-# install mbstring
-RUN docker-php-ext-install mbstring
-
-#Add xsl in PHP containers image
-RUN docker-php-ext-install xsl
-
-# install composer.phar
-RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
-RUN composer install 
+RUN composer install
 
 # copy over the necessary files
 COPY run_php.sh /php-dev/run_php.sh 
@@ -27,4 +42,4 @@ RUN chmod 755 /php-dev/run_php.sh
 VOLUME ["/source"]
 
 # allow interactive bash inside docker container
-CMD ./run_php.sh $API_KEY $FILENAME $ALT_URL $GIT_USERNAME $VERSION
+CMD ./run_php.sh $API_KEY $FILENAME $ALT_URL $GIT_USERNAME $VERSION

docker/Dockerfile-php7

@@ -0,0 +1,45 @@
+FROM phusion/baseimage
+MAINTAINER Fiona Hasanaj
+ENV TZ=America/New_York
+
+# install necessary software
+
+RUN apt-get -y update && apt-get install -y \
+    git \
+    language-pack-en-base \
+    libxslt1-dev \
+    python-software-properties \
+    vim \
+    wget
+
+RUN LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get -y update && apt-get install -y \
+    php7.0-dev \
+    php7.0-cli \
+    php7.0-curl \
+    php7.0-xsl \
+    libapache2-mod-php7.0
+
+
+RUN echo "memory_limit=-1" >> /etc/php/7.0/cli/php.ini && \
+    echo "date.timezone=America/New_York" >> /etc/php/7.0/cli/php.ini
+
+RUN wget -O /usr/local/bin/composer https://getcomposer.org/composer.phar && \
+    chmod +x /usr/local/bin/composer
+
+# copy over the necessary files
+RUN mkdir /php-dev && mkdir /php-dev/tests
+COPY composer.json /php-dev/composer.json
+WORKDIR /php-dev
+
+RUN composer install
+
+# copy over the necessary files
+COPY run_php.sh /php-dev/run_php.sh 
+RUN chmod 755 /php-dev/run_php.sh
+
+# specify docker volume
+VOLUME ["/source"]
+
+# allow interactive bash inside docker container
+CMD ./run_php.sh $API_KEY $FILENAME $ALT_URL $GIT_USERNAME $VERSION

docker/composer.json

@@ -1,6 +1,6 @@
 {
   "name": "rosette/api",
-  "version": "0.8.0",
+  "version": "1.0.0",
   "description": "Rosette API PHP client SDK",
   "license": "Apache",
   "keywords": [
@@ -16,11 +16,14 @@
     }
   ],
   "require-dev": {
-    "phpunit/phpunit": ">=4.6",
+    "phpspec/phpspec": "~2.5",
     "fabpot/php-cs-fixer": ">=1.9",
     "phpdocumentor/phpdocumentor": "~2.8"
   },
+  "config": {
+    "bin-dir": "bin"
+  },
   "autoload": {
     "psr-4": {"rosette\\": "/source/source/rosette"}
   }
-}
+}

docker/run_php.sh

@@ -120,10 +120,10 @@ fi
 
 
 #Run unit tests
-cd /php-dev && ./vendor/bin/phpunit -v --bootstrap ./vendor/autoload.php ./tests/rosette/api/ApiTest.php
+cd /php-dev && ./bin/phpspec run
 
 #Run php-cs-fixer
-./vendor/bin/php-cs-fixer fix . --dry-run --diff --level=psr2
+./bin/php-cs-fixer fix . --dry-run --diff --level=psr2
 
 #Generate gh-pages and push them to git account (if git username is provided)
 if [ ! -z ${GIT_USERNAME} ] && [ ! -z ${VERSION} ]; then

examples/entities_linked.php

@@ -18,6 +18,7 @@
 $params = new DocumentParameters();
 $content = $entities_linked_text_data;
 $params->set('content', $content);
+$params->set('genre', 'social-media');
 
 try {
     $result = $api->entities($params, true);