Merge branch 'develop' into patch-19

craftcms · Aug 28, 2019 · 1755a98 · 1755a98
2 parents 5daf151 + 72a3873
commit 1755a98
Show file tree

Hide file tree

Showing 383 changed files with 24,207 additions and 4,286 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ branches:
   only:
   - develop
   - feature/tests
+  - 3.3
 services:
 - mysql
 - postgresql

diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
diff --git a/codeception.yml b/codeception.yml
@@ -61,3 +61,8 @@ groups:
   validators: [tests/unit/validators]
   web: [tests/unit/web]
   app: [tests/unit/AppTest.php]
+  gql:
+    - 'tests/unit/gql'
+    - 'tests/unit/services/GqlTest'
+    - 'tests/unit/helpers/GqlHelperTest'
+    - 'tests/gql/GqlCest'
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/cms",
   "description": "Craft CMS",
-  "version": "3.2.10",
+  "version": "3.3.0.1",
   "keywords": [
     "cms",
     "craftcms",
@@ -32,7 +32,7 @@
     "craftcms/plugin-installer": "~1.5.3",
     "craftcms/server-check": "~1.1.0",
     "creocoder/yii2-nested-sets": "~0.9.0",
-    "danielstjules/stringy": "^3.1.0",
+    "voku/stringy": "^5.1.0",
     "elvanto/litemoji": "^1.3.1",
     "enshrined/svg-sanitize": "~0.9.0",
     "guzzlehttp/guzzle": "^6.3.0",
@@ -44,6 +44,7 @@
     "symfony/yaml": "^3.2|^4.0",
     "true/punycode": "^2.1.0",
     "twig/twig": "~2.11.0",
+    "webonyx/graphql-php": "^0.12.0",
     "yii2tech/ar-softdelete": "^1.0.2",
     "yiisoft/yii2": "~2.0.21.0",
     "yiisoft/yii2-debug": "^2.0.10",
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ branches: @@
       only:
       - develop
       - feature/tests
+      - 3.3
     services:
     - mysql
     - postgresql
@@ Expand Down @@