Merge pull request #22 from PedroTroller/beta

release

.circleci/config.yml

@@ -61,7 +61,7 @@ jobs:
       - run: |
           nvm install 15.0.1
           npm install
-          node_modules/.bin/semantic-release
+          node_modules/.bin/semantic-release --ci false
 
 
 workflows:

.dockerignore

@@ -1,3 +1,8 @@
-vendor
-Dockerfile
-.*
+*
+
+!/Gemfile*
+!/behat.yaml.dist
+!/composer*
+!/features/
+!/html/
+!/package*

.github/dependabot.yml

@@ -29,5 +29,6 @@ updates:
     schedule:
       interval: "daily"
     commit-message:
-      prefix: build
+      prefix: fix
+      prefix-development: build
     target-branch: beta

.github/semantic.yml

@@ -1,5 +1,5 @@
 ---
-titleAndCommits: true
+commitsOnly: true
 
 types:
   - build

.gitignore

@@ -1 +1,2 @@
-vendor
+/node_modules/
+/vendor/

.php_cs.dist

@@ -27,7 +27,7 @@ return PhpCsFixer\Config::create()
     ->registerCustomFixers(new Fixers())
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__)
+            ->in(__DIR__ . '/html')
             ->append([__FILE__])
     )
 ;

Dockerfile

@@ -4,43 +4,49 @@ FROM composer:2.0.4 as composer
 
 FROM php:7.4.12-apache AS prod
 
-RUN apt-get update \
+RUN (curl -sL https://deb.nodesource.com/setup_14.x | bash) \
+ && apt-get update \
  && apt-get install -y --no-install-recommends \
         git \
         libghc-gnuidn-dev \
+        locales \
+        nodejs \
         perl \
         python \
         python-pip \
         ruby-dev \
         unzip \
-        locales \
         zlib1g-dev \
+ && pip install docutils==0.14 \
+ && gem install bundler \
  && rm -rf /var/lib/apt/lists/*
 
+RUN bundle config set no-cache 'true'
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
 RUN echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
     locale-gen && \
     locale -a
 
 ENV LANG=en_US.UTF-8
+ENV PATH /var/www/node_modules/.bin:$PATH
 
-RUN pip install docutils==0.14
-
-RUN gem install bundler
-
-COPY --from=composer /usr/bin/composer /usr/bin/composer
-
-WORKDIR /var/www/html
+WORKDIR /var/www
 
-COPY composer.* /var/www/html/
-RUN composer install --no-scripts --no-dev
+COPY Gemfile* /var/www/
+COPY composer.* /var/www/
+COPY package* /var/www/
 
-COPY Gemfile* /var/www/html/
-RUN bundler install
+RUN bundler install  --jobs $(($(nproc) * 2)) \
+ && composer install --no-scripts --no-dev \
+ && npm install
 
-COPY . /var/www/html
+COPY . /var/www
 
 ########################################
 
 FROM prod AS dev
 
-RUN composer install --no-scripts --no-dev
+RUN composer install --no-scripts \
+ && npm install --dev

behat.yaml.dist

@@ -1,6 +1,7 @@
+---
 default:
-    suites:
-        default:
-            contexts:
-                - FeatureContext:
-                    host: "http://localhost/"
+  suites:
+    default:
+      contexts:
+        - FeatureContext:
+            host: "http://prod/"

composer.json

@@ -1,14 +1,15 @@
 {
     "name": "pedrotroller/http-markup",
     "require": {
+        "react/promise": "^2.8",
         "slim/slim": "^3.11",
-        "symfony/process": "^4.1"
+        "symfony/process": "^5.1"
     },
     "require-dev": {
         "behat/behat": "^3.5",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.2",
         "pedrotroller/php-cs-custom-fixer": "^2.15",
-        "sebastian/diff": "^3.0",
+        "sebastian/diff": "^4.0",
         "webmozart/assert": "^1.3"
     },
     "autoload-dev": {