Ease local development, use PHP 7.4, various fixes

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
         os:
           - ubuntu-latest
         php:
-          - "7.0"
+          - "7.4"
         mariadb:
           - "10.5"
 
@@ -40,7 +40,7 @@ jobs:
       - name: Set up NodeJS
         uses: actions/setup-node@v2
         with:
-          node-version: '12'
+          node-version: '13'
 
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
@@ -54,10 +54,6 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
 
-      - name: Determine composer cache directory on Windows
-        if: matrix.os == 'windows-latest'
-        run: echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
       - name: Cache dependencies installed with composer
         uses: actions/cache@v2
         with:
@@ -77,7 +73,7 @@ jobs:
           sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web-local.php
 
       - name: Install node dependencies
-        run: npm install -g gulp-cli && npm install -g yarn && yarn install
+        run: npm install -g gulp-cli && npm install
 
       - name: Compile assets
         run: touch assets/src/scss/2-vendors/contributors.css && gulp build

.gitignore

@@ -40,6 +40,9 @@ phpunit.phar
 /web/index.php
 /web/.htaccess
 
+# environment-dependent files (miscellaneous)
+docker-compose.override.yml
+
 # files automatically generated on dev platform
 /web/css/*
 /web/js/*

Dockerfile

@@ -0,0 +1,66 @@
+# PHP
+
+FROM php:7.4-fpm
+
+# System packages
+
+RUN apt-get update
+RUN apt-get install -y texlive-full
+RUN apt-get install -y python3-pygments
+RUN apt-get install -y libnotify-bin
+RUN apt-get install -y git
+RUN apt-get install -y nginx
+RUN apt-get install -y rsync
+
+# PHP extensions
+# https://github.com/mlocati/docker-php-extension-installer
+
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
+RUN install-php-extensions gd intl pdo_mysql opcache zip
+
+# Composer
+
+COPY --from=composer:2.2.3 /usr/bin/composer /usr/local/bin/composer
+
+# Node.js
+# https://github.com/nvm-sh/nvm
+
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+SHELL ["/bin/bash", "--login", "-c"]
+RUN command -v nvm
+RUN nvm install 13.14.0
+
+# Node.js global packages
+
+RUN npm install -g gulp-cli --loglevel=verbose
+RUN npm install -g pageres-cli --loglevel=verbose --unsafe-perm=true
+
+# PHP configuration
+
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+RUN sed -i 's,^memory_limit =.*$,memory_limit = -1,' "$PHP_INI_DIR/php.ini"
+
+ENV VENDOR_DIR=/code/vendor
+
+# Nginx configuration
+
+COPY nginx-site.conf /etc/nginx/sites-enabled/default
+
+# PHP packages
+
+COPY composer.* /code/
+WORKDIR /code
+RUN composer config vendor-dir $VENDOR_DIR
+RUN composer install
+RUN composer config vendor-dir vendor
+
+# Node.js packages
+
+COPY package.json /code
+WORKDIR /code
+RUN npm install --loglevel=verbose
+
+# Code
+
+ADD . /code/src
+WORKDIR /code/src

Dockerfile.yii-1.0

@@ -0,0 +1,15 @@
+# PHP
+
+FROM php:7.0-cli
+
+# System packages
+
+RUN apt-get update
+RUN apt-get install -y git
+
+# Code
+
+ADD . /code
+WORKDIR /code
+
+ENTRYPOINT ["rm", "-rf", "api-1.0"]

Makefile

@@ -25,7 +25,7 @@ deploy:
 
 docs: api guide download
 
-api: api-1.0 api-1.1 api-2.0
+api: api-1.1 api-2.0
 	./yii search/rebuild api
 
 guide: guide-1.0 guide-1.1 guide-2.0
@@ -45,19 +45,21 @@ guide-%: yii-%
 download-%: TARGET_DIR=data/docs-offline
 download-%: SOURCE_DIR=data/yii-$(subst download-,,$@)
 download-%: DOC_DIR=yii-docs-$(subst download-,,$@)
+download-%: VENDOR_DIR=vendor
+download-%: APIDOC_BIN=${VENDOR_DIR}/bin/apidoc
 download-%: LANGUAGES=en $(shell find ${SOURCE_DIR}/docs/ | grep -ioP 'guide-[a-z-]+$$' | cut -c 7-)
 download-%: yii-%
 	cd ${SOURCE_DIR}/docs && ln -sf guide guide-en
-	vendor/bin/apidoc api ${SOURCE_DIR}/framework,${SOURCE_DIR}/extensions ${TARGET_DIR}/${DOC_DIR} --interactive=0
-	for l in ${LANGUAGES} ; do \
+	${APIDOC_BIN} api ${SOURCE_DIR}/framework,${SOURCE_DIR}/extensions ${TARGET_DIR}/${DOC_DIR} --interactive=0
+	for l in $(shell echo "${LANGUAGES}" | xargs -n1 | sort -u | xargs) ; do \
 		echo ""  ; \
 		echo "building guide and api package for language $$l..."  ; \
 		test -d ${TARGET_DIR}/${DOC_DIR}-$$l && rm -rf ${TARGET_DIR}/${DOC_DIR}-$$l  ; \
 		test -f ${TARGET_DIR}/${DOC_DIR}-$$l.tar.gz && rm ${TARGET_DIR}/${DOC_DIR}-$$l.tar.gz  ; \
 		test -f ${TARGET_DIR}/${DOC_DIR}-$$l.tar.bz2 && rm ${TARGET_DIR}/${DOC_DIR}-$$l.tar.bz2  ; \
 		cp -ar ${TARGET_DIR}/${DOC_DIR} ${TARGET_DIR}/${DOC_DIR}-$$l  ; \
-		vendor/bin/apidoc guide ${SOURCE_DIR}/docs/guide-$$l ${TARGET_DIR}/${DOC_DIR}-$$l --interactive=0  ; \
-		vendor/bin/apidoc api ${SOURCE_DIR}/framework,${SOURCE_DIR}/extensions ${TARGET_DIR}/${DOC_DIR}-$$l --interactive=0 ; \
+		${APIDOC_BIN} guide ${SOURCE_DIR}/docs/guide-$$l ${TARGET_DIR}/${DOC_DIR}-$$l --interactive=0  ; \
+		${APIDOC_BIN} api ${SOURCE_DIR}/framework,${SOURCE_DIR}/extensions ${TARGET_DIR}/${DOC_DIR}-$$l --interactive=0 ; \
 		rm -r ${TARGET_DIR}/${DOC_DIR}-$$l/cache  ; \
 		cd ${TARGET_DIR} && tar czf ${DOC_DIR}-$$l.tar.gz ${DOC_DIR}-$$l ; cd - ; \
 		cd ${TARGET_DIR} && tar cjf ${DOC_DIR}-$$l.tar.bz2 ${DOC_DIR}-$$l ; cd - ; \
@@ -66,14 +68,15 @@ download-%: yii-%
 
 
 # targets for cloning yii repos for building docs
-yii-1.0:
+yii-1.0: composer
 	test -d data/yii-1.0 || git clone https://github.com/yiisoft/yii.git data/yii-1.0
 	cd data/yii-1.0 && git checkout 1.0.12 && git checkout master build/
+	COMPOSER=composer.yii-1.0.json php data/composer.phar install
 
 yii-1.1: composer
 	test -d data/yii-1.1 || git clone https://github.com/yiisoft/yii.git data/yii-1.1
 	cd data/yii-1.1 && git pull
-	cd data/yii-1.1 && (grep "phpunit/phpunit" composer.lock > /dev/null || php ../composer.phar require --dev --prefer-dist "phpunit/phpunit:~3.7" "phpunit/phpunit-selenium:~1.4.0")
+	cd data/yii-1.1 && php ../composer.phar require --dev --prefer-dist "phpunit/phpunit:4.8.34" "phpunit/phpunit-selenium:~1.4.0"
 
 yii-2.0: yii-2.0-git yii-2.0-ext-apidoc yii-2.0-ext-authclient yii-2.0-ext-bootstrap yii-2.0-ext-debug yii-2.0-ext-elasticsearch yii-2.0-ext-faker yii-2.0-ext-gii yii-2.0-ext-httpclient yii-2.0-ext-imagine yii-2.0-ext-jui yii-2.0-ext-mongodb yii-2.0-ext-redis yii-2.0-ext-shell yii-2.0-ext-smarty yii-2.0-ext-sphinx yii-2.0-ext-swiftmailer yii-2.0-ext-twig