Separate step for linting in travis matrix. Readded phpdocumentor

Author: massimilianobraglia

.travis.yml

@@ -20,6 +20,7 @@ env:
     - TARGET="71"
     - TARGET="72"
     - TARGET="73"
+    - TARGET="Lint"
 
 before_install:
   # check running "docker engine" and "docker-compose" version on travis
@@ -41,8 +42,8 @@ before_script:
   - sudo sysctl -w vm.max_map_count=262144
 
 script:
-  - make tests TARGET=$TARGET
-  - if [ "$TARGET" == "72" ] ; then make check-style ; fi
+  - if [ "$TARGET" != "Lint" ] ; then make tests TARGET=$TARGET ; fi
+  - if [ "$TARGET" == "Lint" ] ; then make check-style ; fi
 
 after_script:
   - cat /var/log/elasticsearch/*.log

Makefile

@@ -61,7 +61,7 @@ tests:
 	make start
 	mkdir -p build
 
-	docker run -e "ES_HOST=elasticsearch" --network=elastica_esnet elastica_elastica  make phpunit
+	docker run -e "ES_HOST=elasticsearch" --network=elastica_esnet elastica_elastica make phpunit
 	docker cp elastica:/elastica/build/coverage/ $(shell pwd)/build/coverage
 
 # Makes it easy to run a single test file. Example to run IndexTest.php: make test TEST="IndexTest.php"
@@ -83,6 +83,11 @@ lint:
 
 .PHONY: check-style
 check-style:
+	docker build -t ruflin/elastica-dev-base -f env/elastica/${TARGET} env/elastica/
+	docker build -t ruflin/elastica .
+	make start
+	mkdir -p build
+
 	${RUN_ENV} php-cs-fixer fix --allow-risky=yes --dry-run
 
 .PHONY: loc

env/elastica/Docker70

@@ -34,7 +34,5 @@ ENV PATH=/root/composer/vendor/bin:$PATH
 
 COPY composer.json /root/composer/
 
-RUN composer global require --no-update friendsofphp/php-cs-fixer:^2.0
-
 # Install development tools, prefer source removed as automatic fallback now
 RUN composer global install

env/elastica/Docker71

@@ -34,7 +34,5 @@ ENV PATH=/root/composer/vendor/bin:$PATH
 
 COPY composer.json /root/composer/
 
-RUN composer global require --no-update friendsofphp/php-cs-fixer:^2.0
-
 # Install development tools, prefer source removed as automatic fallback now
 RUN composer global install

env/elastica/Docker72

@@ -32,7 +32,5 @@ ENV PATH=/root/composer/vendor/bin:$PATH
 
 COPY composer.json /root/composer/
 
-RUN composer global require --no-update friendsofphp/php-cs-fixer:^2.0
-
 # Install development tools, prefer source removed as automatic fallback now
 RUN composer global install

env/elastica/Lint

@@ -0,0 +1,39 @@
+# This image is the base image for the Elastica development and includes all parts which rarely change
+# PHP 7 Docker file with Composer installed
+FROM php:7.2
+MAINTAINER Nicolas Ruflin <[email protected]>
+
+RUN apt-get update && apt-get install -y \
+	cloc \
+	git \
+	graphviz \
+	libxslt-dev \
+	nano \
+	zip unzip \
+	wget
+	# XSL and Graphviz for PhpDocumentor
+
+RUN docker-php-ext-install sockets xsl
+
+RUN rm -r /var/lib/apt/lists/*
+
+# Xdebug for coverage report
+RUN pecl install xdebug-2.6.1
+
+RUN echo "memory_limit=1024M" >> /usr/local/etc/php/conf.d/memory-limit.ini
+RUN echo "date.timezone=UTC" >> /usr/local/etc/php/conf.d/timezone.ini
+
+# Install and setup composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+ENV COMPOSER_HOME /root/composer
+
+# Add composer bin to the environment
+ENV PATH=/root/composer/vendor/bin:$PATH
+
+COPY composer.json /root/composer/
+
+RUN composer global remove --no-update phpdocumentor/phpdocumentor -vvv
+RUN composer global require --no-update friendsofphp/php-cs-fixer:^2.0
+
+# Install development tools, prefer source removed as automatic fallback now
+RUN composer global install -vvv

env/elastica/composer.json

@@ -13,6 +13,7 @@
     ],
     "require": {
         "php": "^7.0",
+        "phpdocumentor/phpdocumentor": "^2.9",
         "mayflower/php-codebrowser": "~1.1",
         "pdepend/pdepend": "^2.5",
         "phploc/phploc": "^4.0",