Merge remote-tracking branch 'upstream/main' into diff-cmd

box-project · Oct 8, 2023 · 080d09f · 080d09f
2 parents 5e413be + 72fa0bd
commit 080d09f
Show file tree

Hide file tree

Showing 77 changed files with 2,177 additions and 4,322 deletions.
diff --git a/.github/workflows/auto-review.yaml b/.github/workflows/auto-review.yaml
@@ -3,7 +3,18 @@ name: AutoReview
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
+env:
+    TERM: xterm
 
 jobs:
     lint-cs:

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -3,10 +3,21 @@ name: Docker
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
     release:
         types: [ created ]
 
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
+env:
+    TERM: xterm
+
 permissions:
     contents: read
     packages: write

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -3,13 +3,22 @@ name: End-to-End Tests
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
     release:
         types: [ created ]
 
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
 env:
     POLLING_INTERVALS_SEC: 30
     SLEEP_TIME_SEC: 60s
+    TERM: xterm
 
 jobs:
     wait-for-phar-and-docker-images:

diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
@@ -9,6 +9,14 @@ on:
             - mkdocs.yaml
             - .github/workflows/gh-pages.yaml
 
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
+env:
+    TERM: xterm
+
 jobs:
     deploy:
         runs-on: ubuntu-20.04

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -3,13 +3,22 @@ name: Release
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
     release:
         types: [ created ]
 
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
 env:
     DOCKERFILE: .docker/Dockerfile
     DOCKERHUB_USERNAME: boxproject
+    TERM: xterm
 
 jobs:
     build-phar:

diff --git a/.github/workflows/requirement-checker.yaml b/.github/workflows/requirement-checker.yaml
@@ -4,10 +4,20 @@ on:
     push:
         branches: [ main ]
     pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
 
 env:
     POLLING_INTERVALS_SEC: 30
     SLEEP_TIME_SEC: 60s
+    #TERMINFO: /usr/lib/terminfo
+    TERM: xterm
 
 jobs:
     cs-lint:

diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml
@@ -3,10 +3,21 @@ name: Security
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
     release:
         types: [ created ]
 
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
+env:
+    TERM: xterm
+
 jobs:
     security:
         runs-on: ubuntu-latest

diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -3,10 +3,21 @@ name: Unit Tests
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
     release:
         types: [ created ]
 
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
+env:
+    TERM: xterm
+
 jobs:
     unit-tests:
         runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -3,9 +3,9 @@ MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
 OS := $(shell uname)
-ERROR_COLOR := \033[41m
-YELLOW_COLOR = \033[0;33m
-NO_COLOR = \033[0m
+ERROR_COLOR := $(shell tput setab 1)
+YELLOW_COLOR := $(shell tput setaf 3)
+NO_COLOR := $(shell tput sgr0)
 
 COMPOSER_BIN_PLUGIN_VENDOR = vendor/bamarni/composer-bin-plugin
 

diff --git a/Makefile.e2e b/Makefile.e2e
@@ -3,6 +3,7 @@ MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
 DOCKER_RUN = docker run --interactive --platform=linux/amd64 --rm --workdir=/opt/box
+DOCKER_RUN_NO_PULL = docker run --interactive --platform=linux/amd64 --rm --pull=never
 # Matches the minimum PHP version supported by Box.
 DOCKER_MIN_BOX_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php81
 DOCKER_MIN_BOX_XDEBUG_PHP_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php81_xdebug
@@ -366,7 +367,7 @@ _e2e_dockerfile: $(SCOPED_BOX_BIN)
 	@mkdir -p $(E2E_DOCKERFILE_OUTPUT_DIR)
 
 	docker buildx build $(shell dirname $(E2E_DOCKERFILE_DOCKERFILE)) --platform=linux/amd64 --tag=$(E2E_DOCKERFILE_IMAGE_TAG)
-	docker run --interactive --pull=never --rm $(E2E_DOCKERFILE_IMAGE_TAG) \
+	$(DOCKER_RUN_NO_PULL) $(E2E_DOCKERFILE_IMAGE_TAG) \
 		1>$(E2E_DOCKERFILE_ACTUAL_STDOUT) \
 		2>$(E2E_DOCKERFILE_ACTUAL_STDERR)
 
@@ -383,7 +384,7 @@ _e2e_dockerfile_no_extension: $(SCOPED_BOX_BIN)
 	@mkdir -p $(E2E_DOCKERFILE_NO_EXT_OUTPUT_DIR)
 
 	docker buildx build $(shell dirname $(E2E_DOCKERFILE_NO_EXT_DOCKERFILE)) --platform=linux/amd64 --tag=$(E2E_DOCKERFILE_NOT_EXT_IMAGE_TAG)
-	docker run --interactive --pull=never --rm $(E2E_DOCKERFILE_NOT_EXT_IMAGE_TAG) \
+	$(DOCKER_RUN_NO_PULL) $(E2E_DOCKERFILE_NOT_EXT_IMAGE_TAG) \
 		1>$(E2E_DOCKERFILE_NO_EXT_ACTUAL_STDOUT) \
 		2>$(E2E_DOCKERFILE_NO_EXT_ACTUAL_STDERR)
 

diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "composer/semver": "^3.3.2",
         "composer/xdebug-handler": "^3.0.3",
         "fidry/console": "^0.5.3",
+        "fidry/filesystem": "^1.1",
         "humbug/php-scoper": "^0.18.3",
         "justinrainbow/json-schema": "^5.2.12",
         "laravel/serializable-closure": "^1.2.2",
@@ -45,7 +46,7 @@
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
         "ergebnis/composer-normalize": "^2.29",
-        "fidry/makefile": "^0.2.1",
+        "fidry/makefile": "^1.0",
         "mikey179/vfsstream": "^1.6.11",
         "phpspec/prophecy-phpunit": "^2.0.1",
         "phpunit/phpunit": "^9.5.26",
@@ -68,7 +69,6 @@
             "KevinGH\\Box\\": "src"
         },
         "files": [
-            "src/FileSystem/file_system.php",
             "src/consts.php",
             "src/functions.php"
         ],