Merge pull request #55 from creative-commoners/pulls/6/remove-watea

DEP Remove remaining cwp dependencies and code
silverstripe · Mar 4, 2024 · 6de6537 · 6de6537
2 parents 1158a7c + ab16e9b
commit 6de6537
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 95 deletions.
diff --git a/README.md b/README.md
@@ -17,12 +17,3 @@ composer create-project silverstripe/recipe-kitchen-sink ./cms-sink ^4
 
 See the [recipe plugin](https://github.com/silverstripe/recipe-plugin) page for instructions on how
 Silverstripe CMS recipes work.
-
-## Troubleshooting
-
-### Page and PageController parent classes
-
-When installing the kitchen sink, your project Page and PageController subclasses may be set to extend
-SiteTree and ContentController. This is [only an issue](https://github.com/silverstripe/cwp-recipe-kitchen-sink/issues/30)
-with the kitchen sink recipe, and requires you to manually change the parent classes to CWP's BasePage and
-BasePageController.
diff --git a/app/_config/agencyextensions.yml b/app/_config/agencyextensions.yml
diff --git a/app/_config/environmentcheck.yml b/app/_config/environmentcheck.yml
@@ -1,5 +1,5 @@
 ---
-Name: cwpcoreenvironmentchecks
+Name: coreenvironmentchecks
 ---
 SilverStripe\EnvironmentCheck\EnvironmentCheckSuite:
   registered_checks:
@@ -9,17 +9,3 @@ SilverStripe\EnvironmentCheck\EnvironmentCheckSuite:
   registered_suites:
     health:
       - db
-
----
-Name: cwpcoresolrenvironmentcheck
-Only:
-  moduleexists: 'cwp/cwp-search'
----
-SilverStripe\EnvironmentCheck\EnvironmentCheckSuite:
-  registered_checks:
-    solr:
-      definition: 'SilverStripe\EnvironmentCheck\Checks\SolrIndexCheck()'
-      title: 'Are all Solr indexes available?'
-  registered_suites:
-    health:
-      - solr
diff --git a/app/_config/security.yml b/app/_config/security.yml
diff --git a/app/_config/theme.yml b/app/_config/theme.yml
@@ -1,9 +1,8 @@
 ---
-Name: cwptheme
+Name: theme
 ---
 SilverStripe\View\SSViewer:
   themes:
     - '$public'
-    - 'watea'
-    - 'starter'
+    - 'simple'
     - '$default'
diff --git a/app/_config/versionfeed.yml b/app/_config/versionfeed.yml
diff --git a/app/src/HomePage.php b/app/src/HomePage.php
diff --git a/app/src/HomePageController.php b/app/src/HomePageController.php
diff --git a/app/src/Page.php b/app/src/Page.php
diff --git a/app/src/PageController.php b/app/src/PageController.php
diff --git a/composer.json b/composer.json
@@ -31,8 +31,6 @@
         "silverstripe/subsites": "4.x-dev",
         "silverstripe/lumberjack": "4.x-dev",
         "silverstripe/staticpublishqueue": "7.x-dev",
-        "cwp/starter-theme": "5.x-dev",
-        "cwp/watea-theme": "5.x-dev",
         "dnadesign/silverstripe-elemental-userforms": "5.x-dev",
         "symbiote/silverstripe-multivaluefield": "7.x-dev",
         "symbiote/silverstripe-gridfieldextensions": "5.x-dev",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -28,9 +28,8 @@
             <directory>vendor/silverstripe/cms/tests/</directory>
         </testsuite>
 
-        <!-- Optional CWP modules that aren't in recipes -->
+        <!-- Optional modules that aren't in recipes -->
         <testsuite name="Default">
-            <directory>vendor/cwp/agency-extensions/tests</directory>
             <directory>vendor/silverstripe/subsites/tests</directory>
             <directory>vendor/silverstripe/crontask/tests</directory>
             <directory>vendor/silverstripe/gridfieldqueuedexport/tests</directory>
@@ -41,7 +40,6 @@
         </testsuite>
 
         <testsuite name="recipe-ccl">
-            <directory>vendor/cwp/cwp-core/tests</directory>
             <directory>vendor/silverstripe/auditor/tests</directory>
             <directory>vendor/silverstripe/environmentcheck/tests</directory>
             <directory>vendor/silverstripe/hybridsessions/tests</directory>