Merge branch 'master' into add-example-site-fixtures

.github/workflows/split-monorepo.yml

@@ -14,6 +14,64 @@ concurrency:
 
 jobs:
 
+  hyde: 
+    runs-on: ubuntu-latest
+    environment:
+      name: hydephp/hyde
+      url: https://github.com/hydephp/hyde/tree/master
+
+    steps:
+    - name: Checkout hydephp/develop
+      uses: actions/checkout@v3
+      with:
+        path: develop
+        persist-credentials: false 
+
+    - name: Checkout hydephp/hyde
+      uses: actions/checkout@v3
+      with:
+        repository: hydephp/hyde
+        path: hyde
+        ref: develop
+        fetch-depth: 0
+        persist-credentials: false 
+
+    - name: Download base files
+      run: wget https://github.com/hydephp/develop/zipball/${{ github.sha }} -O hyde.zip
+
+    - name: Unzip archive
+      run: unzip hyde.zip
+
+    - name: Empty the hyde directory
+      run: rm -rf hyde/* 
+
+    - name: Copy over base files
+      run: cp -rf hydephp-develop-*/* hyde -v
+
+    - name: Copy over persisted files
+      run: cp -rf develop/packages/hyde/. hyde -v
+
+    - name: Remove monorepo support files
+      run: |
+        rm -rf hyde/monorepo -v
+        rm hyde/CHANGELOG.md -v
+        rm hyde/phpunit.dusk.xml -v
+        rm hyde/psalm.xml -v
+
+    - name: Commit and push changes
+      run: |
+        cd hyde
+
+        git config user.name github-actions
+        git config user.email github-actions@github.com
+        git remote add upstream https://${{ secrets.PAT }}@github.com/hydephp/hyde.git
+
+        git add .
+        git commit -m "${{ github.event.head_commit.message }} https://github.com/hydephp/develop/commit/${{ github.sha }}" || true
+
+        git push upstream develop
+
+
   framework: 
     runs-on: ubuntu-latest
     environment:
@@ -32,7 +90,7 @@ jobs:
       with:
         repository: hydephp/framework
         path: framework
-        ref: master
+        ref: develop
         fetch-depth: 0
         persist-credentials: false 
 
@@ -53,7 +111,7 @@ jobs:
         git add .
         git commit -m "${{ github.event.head_commit.message }} https://github.com/hydephp/develop/commit/${{ github.sha }}" || true
 
-        git push upstream master
+        git push upstream develop
 
 
   realtime-compiler: 
@@ -186,62 +244,6 @@ jobs:
 
         git push upstream upcoming
 
-  hyde: 
-    runs-on: ubuntu-latest
-    environment:
-      name: hydephp/hyde
-      url: https://github.com/hydephp/hyde/tree/master
-
-    steps:
-    - name: Checkout hydephp/develop
-      uses: actions/checkout@v3
-      with:
-        path: develop
-        persist-credentials: false 
-
-    - name: Checkout hydephp/hyde
-      uses: actions/checkout@v3
-      with:
-        repository: hydephp/hyde
-        path: hyde
-        ref: master
-        fetch-depth: 0
-        persist-credentials: false 
-
-    - name: Download base files
-      run: wget https://github.com/hydephp/develop/zipball/${{ github.sha }} -O hyde.zip
-
-    - name: Unzip archive
-      run: unzip hyde.zip
-
-    - name: Empty the hyde directory
-      run: rm -rf hyde/* 
-
-    - name: Copy over base files
-      run: cp -rf hydephp-develop-*/* hyde -v
-
-    - name: Copy over persisted files
-      run: cp -rf develop/packages/hyde/. hyde -v
-
-    - name: Remove monorepo support files
-      run: |
-        rm hyde/CHANGELOG.md
-        rm hyde/phpunit.dusk.xml
-        rm hyde/psalm.xml
-
-    - name: Commit and push changes
-      run: |
-        cd hyde
-
-        git config user.name github-actions
-        git config user.email github-actions@github.com
-        git remote add upstream https://${{ secrets.PAT }}@github.com/hydephp/hyde.git
-
-        git add .
-        git commit -m "${{ github.event.head_commit.message }} https://github.com/hydephp/develop/commit/${{ github.sha }}" || true
-
-        git push upstream master
-
 
   testing: 
     runs-on: ubuntu-latest

.gitignore

@@ -18,3 +18,5 @@
 !/.idea
 /rocket
 build/cache
+
+/tests/fixtures/example-sites/*/vendor

README.md

@@ -57,7 +57,7 @@ The two most important components are **Hyde** and **Framework**. We also use **
 
 ## How the monorepo works
 
-Changes to HydePHP including some first-party packages are made here. The changes are then pushed to the `master` branches of the readonly repositories seen in the table above. These branches could be unstable.
+Changes to HydePHP including some first-party packages are made here. The changes are then pushed to the `develop/master` branches of the readonly repositories seen in the table above. These branches could be unstable.
 
 This monorepo project is still new, and the internal structure of it may be changed without notice.
 

phpunit.xml.dist

@@ -10,7 +10,7 @@
          stopOnFailure="false">
     <testsuites>
         <testsuite name="FeatureHyde">
-            <directory suffix="Test.php">./tests/Hyde/Feature</directory>
+            <directory suffix="Test.php">./packages/hyde/tests/Feature</directory>
         </testsuite>
         <testsuite name="FeatureFramework">
             <directory suffix="Test.php">./packages/framework/tests/Feature</directory>

tests/Hyde/README.md

@@ -1,4 +1,4 @@
-# Hyde/Testing/Hyde
+# Hyde High-Level Testing
 
 This test suite contains high-level tests for the Hyde project as a whole.
 These tests function partially as a sanity check / smoke test for the
@@ -7,6 +7,8 @@ something has gone rather wrong, or that the wrong Framework version
 is loaded. Some tests also check that possibly breaking changes
 are not accidentally introduced.
 
+The test files for the Hyde are stored in [/packages/hyde/tests/](/packages/hyde/tests/)
+
 All tests are feature and/or integration tests.
 
 Run with the following command: