From 563ede21463c583e24ecfef4197d50e1c69e7583 Mon Sep 17 00:00:00 2001
From: TangRufus <tangrufus@gmail.com>
Date: Sun, 17 May 2020 06:01:57 +0800
Subject: [PATCH] CircleCI: Use offical CircleCI PHP orb and next-gen docker
 images

---
 .circleci/config.yml | 51 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6690e0321..250a00391d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,52 +1,13 @@
 version: 2.1
 
 orbs:
-  bedrock:
-    executors:
-      php-latest:
-        docker:
-          - image: 'circleci/php:latest'
-      php-73:
-        docker:
-          - image: 'circleci/php:7.3-stretch'
-      php-72:
-        docker:
-          - image: 'circleci/php:7.2-stretch'
-      php-71:
-        docker:
-          - image: 'circleci/php:7.1-stretch'
-    jobs:
-      build-php:
-        parameters:
-          executor:
-            type: executor
-        executor: << parameters.executor >>
-        steps:
-          - run: php -v
-          - checkout
-          - restore_cache:
-              keys:
-                - composer-v1-{{ checksum "composer.lock" }}
-                - composer-v1-
-          - run: composer install -n --prefer-dist
-          - run: composer test
-          - save_cache:
-              key: composer-v1-{{ checksum "composer.lock" }}
-              paths:
-                - vendor
+  php: circleci/php@1
 
 workflows:
   build:
     jobs:
-      - bedrock/build-php:
-          name: build-php-latest
-          executor: bedrock/php-latest
-      - bedrock/build-php:
-          name: build-php-73
-          executor: bedrock/php-73
-      - bedrock/build-php:
-          name: build-php-72
-          executor: bedrock/php-72
-      - bedrock/build-php:
-          name: build-php-71
-          executor: bedrock/php-71
+      - php/test:
+          name: php-<< matrix.version >>
+          matrix:
+            parameters:
+              version: ["7.4", "7.3", "7.2"]