Sync from dev e359c75: Fix strict_types fatal: move use statements after declare

Author: mowens3

.github/workflows/ci.yml

@@ -43,18 +43,16 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.4'
-          tools: phpcs
 
       - name: Install Drupal Coding Standards
         run: |
           composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
           composer global require drupal/coder
-          phpcs --config-set installed_paths ~/.composer/vendor/drupal/coder/coder_sniffer
 
       - name: Run PHPCS
         run: |
+          export PATH="$HOME/.composer/vendor/bin:$PATH"
           phpcs --standard=Drupal,DrupalPractice . --extensions=php,module,install,inc --ignore=*/tests/*,*/vendor/*,*/node_modules/*,*/tmp/*,*/.ddev/*
-        continue-on-error: true
 
   phpunit:
     name: PHPUnit (Drupal ${{ matrix.drupal-version }})
@@ -65,7 +63,7 @@ jobs:
         include:
           - drupal-version: '10.3'
             php-version: '8.3'
-          - drupal-version: '11.0'
+          - drupal-version: '11.1'
             php-version: '8.4'
 
     services:
@@ -173,6 +171,12 @@ jobs:
               <testsuite name="unit">
                 <directory>web/modules/contrib/mcp_tools/tests/src/Unit</directory>
                 <directory>web/modules/contrib/mcp_tools/modules/*/tests/src/Unit</directory>
+                <!-- Contrib-dependent submodules: their tests need classes not installed in CI -->
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_metatag/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_pathauto/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_scheduler/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_sitemap/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_ultimate_cron/tests</exclude>
               </testsuite>
               <testsuite name="kernel">
                 <directory>web/modules/contrib/mcp_tools/tests/src/Kernel</directory>
@@ -407,6 +411,12 @@ jobs:
               <testsuite name="unit">
                 <directory>web/modules/contrib/mcp_tools/tests/src/Unit</directory>
                 <directory>web/modules/contrib/mcp_tools/modules/*/tests/src/Unit</directory>
+                <!-- Contrib-dependent submodules: their tests need classes not installed in CI -->
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_metatag/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_pathauto/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_scheduler/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_sitemap/tests</exclude>
+                <exclude>web/modules/contrib/mcp_tools/modules/mcp_tools_ultimate_cron/tests</exclude>
               </testsuite>
               <testsuite name="kernel">
                 <directory>web/modules/contrib/mcp_tools/tests/src/Kernel</directory>
@@ -460,7 +470,7 @@ jobs:
           ./vendor/bin/phpunit --testsuite unit,kernel,functional --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           files: drupal/coverage.xml
           flags: unittests
@@ -537,7 +547,7 @@ jobs:
           # Enable all submodules (skip those with unmet dependencies)
           for module in mcp_tools_analysis mcp_tools_batch mcp_tools_blocks mcp_tools_cache mcp_tools_config \
                         mcp_tools_content mcp_tools_cron mcp_tools_entity_clone mcp_tools_image_styles \
-                        mcp_tools_layout_builder mcp_tools_media mcp_tools_menus mcp_tools_metatag \
+                        mcp_tools_jsonapi mcp_tools_layout_builder mcp_tools_media mcp_tools_menus mcp_tools_metatag \
                         mcp_tools_migration mcp_tools_moderation mcp_tools_paragraphs mcp_tools_pathauto \
                         mcp_tools_recipes mcp_tools_redirect mcp_tools_scheduler mcp_tools_search_api \
                         mcp_tools_sitemap mcp_tools_structure mcp_tools_templates mcp_tools_theme \

.github/workflows/full-tool-registration.yml

@@ -46,6 +46,7 @@ jobs:
           cd drupal
           composer require drush/drush --no-interaction
           composer require drupal/tool:1.0.0-alpha9 mcp/sdk:^0.2.2 -W --no-interaction
+          composer require code-wheel/mcp-http-security:^1.0 code-wheel/mcp-error-codes:^1.2 code-wheel/mcp-events:^2.0 code-wheel/mcp-schema-builder:^1.1 code-wheel/mcp-tool-gateway:^1.1 -W --no-interaction
 
           # Optional contrib dependencies for all submodules.
           composer require \
@@ -93,7 +94,7 @@ jobs:
           # Enable all submodules.
           for module in mcp_tools_analysis mcp_tools_batch mcp_tools_blocks mcp_tools_cache mcp_tools_config \
                         mcp_tools_content mcp_tools_cron mcp_tools_entity_clone mcp_tools_image_styles \
-                        mcp_tools_layout_builder mcp_tools_media mcp_tools_menus mcp_tools_metatag \
+                        mcp_tools_jsonapi mcp_tools_layout_builder mcp_tools_media mcp_tools_menus mcp_tools_metatag \
                         mcp_tools_migration mcp_tools_moderation mcp_tools_paragraphs mcp_tools_pathauto \
                         mcp_tools_recipes mcp_tools_redirect mcp_tools_scheduler mcp_tools_search_api \
                         mcp_tools_sitemap mcp_tools_structure mcp_tools_templates mcp_tools_theme \

.github/workflows/release.yml

@@ -85,7 +85,7 @@ jobs:
       - name: Install MCP dependencies
         run: |
           cd drupal
-          composer require drupal/tool:1.0.0-alpha9 mcp/sdk:^0.2.2 code-wheel/mcp-http-security:^1.0 -W --no-interaction
+          composer require drupal/tool:1.0.0-alpha9 mcp/sdk:^0.2.2 code-wheel/mcp-http-security:^1.0 code-wheel/mcp-error-codes:^1.2 code-wheel/mcp-events:^2.0 code-wheel/mcp-schema-builder:^1.1 code-wheel/mcp-tool-gateway:^1.1 -W --no-interaction
 
       - name: Copy module
         run: |
@@ -201,7 +201,7 @@ jobs:
 
           ### Compatibility
 
-          - Drupal 10.3.x, 11.0.x
+          - Drupal 10.3.x, 11.x
           - PHP 8.3, 8.4
 
           ### Links
@@ -212,7 +212,7 @@ jobs:
           EOF
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           name: MCP Tools v${{ needs.validate.outputs.version }}
           body_path: release_notes.md

.github/workflows/security.yml

@@ -24,14 +24,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install Gitleaks
-        run: |
-          curl -sSfL https://github.com/gitleaks/gitleaks/releases/download/v8.18.4/gitleaks_8.18.4_linux_x64.tar.gz | tar -xz
-          chmod +x gitleaks
-
       - name: Run Gitleaks
-        run: |
-          ./gitleaks detect --source . --config .gitleaks.toml --verbose
+        uses: gitleaks/gitleaks-action@v2
+        with:
+          args: --config .gitleaks.toml --verbose
+        env:
+          GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE }}
 
   php-security:
     name: PHP Security Check

README.md

@@ -145,7 +145,7 @@ mcp_tools/                        # Base module (25 read-only tools)
 │       └── ErrorFormatter.php    # Standardized error responses
 └── modules/
     ├── mcp_tools_content/        # Content CRUD (4 tools)
-    ├── mcp_tools_structure/      # Content types, fields, taxonomy, roles (12 tools)
+    ├── mcp_tools_structure/      # Content types, fields, taxonomy, roles (20 tools)
     ├── mcp_tools_users/          # User management (5 tools)
     ├── mcp_tools_menus/          # Menu management (5 tools)
     ├── mcp_tools_views/          # Views management (6 tools)
@@ -168,12 +168,13 @@ mcp_tools/                        # Base module (25 read-only tools)
     ├── mcp_tools_pathauto/       # URL aliases (6 tools)
     ├── mcp_tools_redirect/       # URL redirects (7 tools)
     ├── mcp_tools_sitemap/        # XML sitemap (7 tools)
-    ├── mcp_tools_search_api/     # Search API (8 tools)
+    ├── mcp_tools_search_api/     # Search API (9 tools)
     ├── mcp_tools_entity_clone/   # Entity cloning (4 tools)
     ├── mcp_tools_analysis/       # Site analysis (8 tools)
     ├── mcp_tools_batch/          # Bulk operations (6 tools)
     ├── mcp_tools_templates/      # Site templates (5 tools)
-    └── mcp_tools_migration/      # Content migration (7 tools)
+    ├── mcp_tools_migration/      # Content migration (7 tools)
+    └── mcp_tools_jsonapi/        # JSON:API entity CRUD (6 tools)
 ```
 
 Enable submodules as needed:
@@ -287,7 +288,7 @@ Available scopes:
 - `write` - Write operations
 - `admin` - Administrative operations
 
-## Read-Only Tools (22)
+## Read-Only Tools (25)
 
 ### Site Health
 
@@ -320,6 +321,8 @@ Available scopes:
 | `get_config_status` | Config sync status (active vs staged) |
 | `get_config` | View specific configuration object |
 | `list_config` | List config names with optional prefix filter |
+| `list_text_formats` | List all available text formats |
+| `get_text_format` | Get details about a specific text format |
 
 ### Users
 
@@ -342,14 +345,14 @@ Available scopes:
 |------|-------------|
 | `mcp_tools_list_available` | List all available MCP tools by category or search |
 
-## Write Submodules (197 tools across 29 submodules)
+## Write Submodules (197 tools across 30 submodules)
 
 Enable submodules for the capabilities you need. Each submodule's tools are listed in its own `README.md`.
 
 | Submodule | Tools | Description |
 |-----------|------:|-------------|
 | `mcp_tools_content` | 4 | Content CRUD (create, update, delete, publish) |
-| `mcp_tools_structure` | 12 | Content types, fields, vocabularies, roles, permissions |
+| `mcp_tools_structure` | 20 | Content types, fields, vocabularies, roles, permissions |
 | `mcp_tools_users` | 5 | User accounts, roles, blocking |
 | `mcp_tools_menus` | 5 | Menus and menu links |
 | `mcp_tools_views` | 6 | Views creation and management |
@@ -371,12 +374,13 @@ Enable submodules for the capabilities you need. Each submodule's tools are list
 | `mcp_tools_pathauto` | 6 | URL alias patterns (requires `pathauto`) |
 | `mcp_tools_redirect` | 7 | URL redirects (requires `redirect`) |
 | `mcp_tools_sitemap` | 7 | XML sitemap management (requires `simple_sitemap`) |
-| `mcp_tools_search_api` | 8 | Search indexes and servers (requires `search_api`) |
+| `mcp_tools_search_api` | 9 | Search indexes and servers (requires `search_api`) |
 | `mcp_tools_entity_clone` | 4 | Entity cloning (requires `entity_clone`) |
 | `mcp_tools_analysis` | 8 | SEO, security, accessibility, performance audits |
 | `mcp_tools_batch` | 6 | Bulk content operations (max 50 items/batch) |
 | `mcp_tools_templates` | 5 | Site templates (blog, portfolio, business, docs) |
 | `mcp_tools_migration` | 7 | CSV/JSON import and export (max 100 items) |
+| `mcp_tools_jsonapi` | 6 | Generic entity CRUD via JSON:API (requires `jsonapi`) |
 
 **Safety built in:** uid 1 protected, administrator role unassignable, system menus/views/themes guarded, dangerous permissions blocked, batch limits enforced, base64 uploads capped.
 

composer.json

@@ -20,9 +20,9 @@
     "drupal/tool": "^1.0@alpha",
     "mcp/sdk": "^0.2.2",
     "code-wheel/mcp-http-security": "^1.0",
-    "code-wheel/mcp-error-codes": "^1.1",
+    "code-wheel/mcp-error-codes": "^1.2",
     "code-wheel/mcp-events": "^2.0",
-    "code-wheel/mcp-schema-builder": "^1.0",
-    "code-wheel/mcp-tool-gateway": "^1.0"
+    "code-wheel/mcp-schema-builder": "^1.1",
+    "code-wheel/mcp-tool-gateway": "^1.1"
   }
 }

docs/ARCHITECTURE.md

@@ -20,7 +20,7 @@ MCP Tools provides a comprehensive set of tools for AI assistants to interact wi
 │                         mcp_tools module                         │
 │  ┌──────────────────┐  ┌──────────────────┐  ┌───────────────┐  │
 │  │   Tool Plugins   │  │    Services      │  │ Access Control│  │
-│  │  (210+ tools)    │  │ (Business Logic) │  │ (3 layers)    │  │
+│  │  (222 tools)     │  │ (Business Logic) │  │ (3 layers)    │  │
 │  └────────┬─────────┘  └────────┬─────────┘  └───────┬───────┘  │
 │           │                     │                    │          │
 │           └─────────────────────┼────────────────────┘          │
@@ -35,7 +35,7 @@ MCP Tools provides a comprehensive set of tools for AI assistants to interact wi
 ### Base Module (`mcp_tools`)
 
 The base module provides:
-- **22 read-only tools** for site introspection
+- **25 read-only tools** for site introspection
 - **Core services** (AccessManager, RateLimiter, AuditLogger)
 - **Admin UI** for configuration
 - **McpToolsToolBase** base class for all tool plugins

mcp_tools.module

@@ -17,21 +17,23 @@ function mcp_tools_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.mcp_tools':
       $output = '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('MCP Tools provides batteries-included tools for AI assistants working with Drupal sites via the Model Context Protocol (MCP).') . '</p>';
-      $output .= '<h3>' . t('Available Tools (22 read-only)') . '</h3>';
+      $output .= '<h3>' . t('Available Tools (25 read-only)') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Site Health') . '</dt>';
       $output .= '<dd>' . t('GetSiteStatus, GetSystemStatus, CheckSecurityUpdates, CheckCronStatus, AnalyzeWatchdog, GetQueueStatus, GetFileSystemStatus') . '</dd>';
       $output .= '<dt>' . t('Content') . '</dt>';
       $output .= '<dd>' . t('ListContentTypes, GetRecentContent, SearchContent, GetVocabularies, GetTerms, GetFiles, FindOrphanedFiles') . '</dd>';
       $output .= '<dt>' . t('Configuration') . '</dt>';
-      $output .= '<dd>' . t('GetConfigStatus, GetConfig, ListConfig') . '</dd>';
+      $output .= '<dd>' . t('GetConfigStatus, GetConfig, ListConfig, ListTextFormats, GetTextFormat') . '</dd>';
       $output .= '<dt>' . t('Users') . '</dt>';
       $output .= '<dd>' . t('GetRoles, GetUsers, GetPermissions') . '</dd>';
       $output .= '<dt>' . t('Structure') . '</dt>';
       $output .= '<dd>' . t('GetMenus, GetMenuTree') . '</dd>';
+      $output .= '<dt>' . t('Discovery') . '</dt>';
+      $output .= '<dd>' . t('ListAvailableTools') . '</dd>';
       $output .= '</dl>';
       $output .= '<h3>' . t('Write Operations') . '</h3>';
-      $output .= '<p>' . t('Enable the MCP Tools Write submodule for 21 additional write tools (content types, fields, roles, taxonomies, menus).') . '</p>';
+      $output .= '<p>' . t('197 write/analysis tools across 34 optional submodules. Enable the submodules you need for content, structure, views, blocks, media, and more.') . '</p>';
       return $output;
   }
 }

modules/mcp_tools_analysis/src/Plugin/tool/Tool/AnalyzePerformance.php

@@ -11,7 +11,6 @@
 use Drupal\mcp_tools\Tool\McpToolsToolBase;
 use Drupal\tool\Attribute\Tool;
 use Drupal\tool\Tool\ToolOperation;
-use Drupal\tool\TypedData\InputDefinition;
 
 /**
  * Tool plugin implementation.
@@ -81,8 +80,4 @@ protected function executeLegacy(array $input): array {
     return $this->analysisService->analyzePerformance();
   }
 
-  
-
-  
-
 }

modules/mcp_tools_analysis/src/Plugin/tool/Tool/AnalyzeSeo.php

@@ -115,8 +115,4 @@ protected function executeLegacy(array $input): array {
     return $this->analysisService->analyzeSeo($entityType, $entityId);
   }
 
-  
-
-  
-
 }