Merge branch 'OpenConext:master' into custom-doctrine-database-types

Author: Stephan-Kok

CHANGELOG.md

@@ -5,6 +5,10 @@ We will continue to post relevant release notes on the GitHub release page. More
 
 More information about our release strategy can be found in the [Development Guidelines](https://github.com/OpenConext/OpenConext-engineblock/wiki/Development-Guidelines#release-notes) on the EngineBlock wiki.
 
+## 6.6.5
+**Feature**
+ - Upgrade the Monitor bundle, exposing opcache statistics to the info endpoint #1163
+
 ## 6.6.4
 **Features**
 - allow control over the RequestedAttribute list added to the proxy SP metadata

app/config/config.yml

@@ -24,6 +24,7 @@ open_conext_engine_block:
         eb.run_all_manipulations_prior_to_consent: "%feature_run_all_manipulations_prior_to_consent%"
         eb.block_user_on_violation: "%feature_block_user_on_violation%"
         eb.enable_sso_notification: "%feature_enable_sso_notification%"
+        eb.feature_enable_consent: "%feature_enable_consent%"
 
 swiftmailer:
     transport: "%mailer_transport%"

app/config/parameters.yml.dist

@@ -216,6 +216,7 @@ parameters:
     feature_api_deprovision: true
     feature_run_all_manipulations_prior_to_consent: false
     feature_block_user_on_violation: false
+    feature_enable_consent: true
 
     ##########################################################################################
     ## PROFILE SETTINGS

composer.json

@@ -15,6 +15,7 @@
         "ext-dom": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
+        "ext-openssl": "*",
         "beberlei/assert": "^2.6",
         "composer/package-versions-deprecated": "^1.11",
         "doctrine/doctrine-bundle": "^1.11",
@@ -23,7 +24,7 @@
         "guzzlehttp/guzzle": "^6.3",
         "incenteev/composer-parameter-handler": "~2.0",
         "monolog/monolog": "~1.13",
-        "openconext/monitor-bundle": "^1.0",
+        "openconext/monitor-bundle": "^2.1",
         "openconext/saml-value-object": "^1.3",
         "pimple/pimple": "~2.1",
         "ramsey/uuid": "^3.3.0",
@@ -37,8 +38,7 @@
         "symfony/swiftmailer-bundle": "^2.6",
         "symfony/symfony": "3.4.*",
         "twig/extensions": "^1.5",
-        "twig/twig": "^1.35",
-        "ext-openssl": "*"
+        "twig/twig": "^1.35"
     },
     "require-dev": {
         "behat/behat": "~3.0",

composer.lock

@@ -1,16 +1,21 @@
-FROM php:7.2.33-fpm
+FROM php:7.2-fpm
 
 ARG NPM_UID=1000
 ARG NPM_GID=1000
 
 # Copy phpfpm config
 COPY docker/php-fpm/app.ini /usr/local/etc/php/conf.d/
 
+# Yank the node and npm binaries from the official Node docker container
+COPY --from=node:10 /usr/local/lib/node_modules /usr/local/lib/node_modules
+COPY --from=node:10 /usr/local/bin/node /usr/local/bin/node
+RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
+RUN npm install -g npx
+
 # Install dependencies
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 RUN apt-get update && apt-get install -y \
     git \
-    nodejs \
+    python \
     zip \
     chromium \
     libpng-dev \

docker/php-fpm/Dockerfile-php72

@@ -6,11 +6,16 @@ ARG NPM_GID=1000
 # Copy phpfpm config
 COPY docker/php-fpm/app.ini /usr/local/etc/php/conf.d/
 
+# Yank the node and npm binaries from the official Node docker container
+COPY --from=node:10 /usr/local/lib/node_modules /usr/local/lib/node_modules
+COPY --from=node:10 /usr/local/bin/node /usr/local/bin/node
+RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
+RUN npm install -g npx
+
 # Install dependencies
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 RUN apt-get update && apt-get install -y \
     git \
-    nodejs \
+    python \
     zip \
     chromium \
     libpng-dev \