Pushed to version 0.1.2

Reviewed-on: ogrecooper/ogre-schema#1

.gitignore

@@ -7,3 +7,5 @@ composer.phar
 /vendor/
 /lib/*
 /node_modules/
+composer.lock
+package-lock.json

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "java.project.sourcePaths": [
-        ""
-    ]
-}

.vscode/sftp.json

@@ -1,29 +0,0 @@
-{
-    "name": "dev1.ogre.me",
-    "host": "dev.ogre.me",
-    "protocol": "sftp",
-    "port": 22,
-    "username": "dev1ogre",
-    "password": "KuT+T?ctDqJ?s",
-    "remotePath": "/home/dev1ogre/public_html/wp-content/plugins/ogre-schema/",
-    "uploadOnSave": true,
-    "useTempFile": false,
-    "openSsh": false,
-    "ignore": [
-        ".vscode",
-        ".git",
-        ".DS_Store",
-        ".gitignore",
-        "Makefile",
-        "ogre-schema.zip",
-        "ogre-schema",
-        "composer.json",
-        "composer.lock",
-        "package.json",
-        "package-lock.json",
-        "node_modules",
-        "phpcs_xml",
-        "postcss.config.js",
-        "gulpfile.js"
-    ]
-}

Makefile

@@ -16,7 +16,7 @@ copy:
 	cp -RT ./acf-json ./$(PACKAGE)/acf-json
 	cp -RT ./data ./$(PACKAGE)/data
 	cp -RT ./includes ./$(PACKAGE)/includes
-	cp -RT ./lang ./$(PACKAGE)/lang
+	cp -RT ./lang ./$(PACKAGE)/lang || true
 	cp -RT ./lib ./$(PACKAGE)/lib
 	cp -RT ./vendor ./$(PACKAGE)/vendor
 	cp -f ./* ./$(PACKAGE) || true

composer.lock

@@ -1,53 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "62a6a51cbea614094e050f847730af97",
-    "packages": [
-        {
-            "name": "magicoli/wp-package-updater-lib",
-            "version": "v0.1.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/magicoli/wp-package-updater-lib.git",
-                "reference": "e822132741c08d054fb97f249b1143c220f30e6f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/magicoli/wp-package-updater-lib/zipball/e822132741c08d054fb97f249b1143c220f30e6f",
-                "reference": "e822132741c08d054fb97f249b1143c220f30e6f",
-                "shasum": ""
-            },
-            "require-dev": {
-                "froger-me/wp-plugin-update-server": "*"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Magiiic"
-                }
-            ],
-            "description": "Composer package for wp-package-updater library.",
-            "support": {
-                "issues": "https://github.com/magicoli/wp-package-updater-lib/issues",
-                "source": "https://github.com/magicoli/wp-package-updater-lib/tree/v0.1.10"
-            },
-            "time": "2023-06-09T12:42:28+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {},
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {},
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
-}

includes/abstract-plugin-base.php

@@ -38,7 +38,7 @@ abstract class PluginBase {
         add_action('init', [$this, 'setup_textdomain']);
 
         // Requirements Check
-        add_action('plugins_loaded', [$this, 'check_requirements'], 1, 0);
+        add_action('after_setup_theme', [$this, 'check_requirements'], 1, 0);
 
         $this->enable();
     }
@@ -46,11 +46,11 @@ abstract class PluginBase {
     // Plugin Initialization
 
     protected function enable() {
-        add_action('plugins_loaded', [$this, 'load'], 10, 0);
+        add_action('after_setup_theme', [$this, 'load'], 10, 0);
         add_filter('acf/settings/load_json', [$this, 'register_acf_json'], 10, 1);
     }
     protected function disable() {
-        remove_action('plugins_loaded', [$this, 'load'], 10, 0);
+        remove_action('after_setup_theme', [$this, 'load'], 10, 0);
         remove_filter('acf/settings/load_json', [$this, 'register_acf_json'], 10, 1);
     }
 

ogre-schema.php

@@ -3,7 +3,7 @@
  * Plugin Name: OgreSchema
  * Plugin URI: https://plugins.cleverogre.com/plugin/ogreschema/
  * Description: Output schema site-wide for your website.
- * Version: 0.1.1
+ * Version: 0.1.2
  * Requires at Least: 6.0
  * Requires PHP: 8.0
  * Author: CleverOgre
@@ -36,8 +36,8 @@ class Plugin extends PluginBase {
         $this->add_requirement('advanced-custom-fields', [
             'name' => 'Advanced Custom Fields PRO',
             'url' => 'https://www.advancedcustomfields.com/',
-            'type' => self::REQUIREMENT_PLUGIN,
-            'plugin' => 'advanced-custom-fields-pro/acf.php',
+            'type' => self::REQUIREMENT_CLASS,
+            'class' => '\ACF',
         ]);
 
         $this->add_files([

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "ogre-schema",
 	"title": "OgreSchema",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"author": "CleverOgre",
 	"license": "GPL-3.0+",
 	"keywords": [],

phpcs.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="SomewhereWarm-cs">
-	<description>SomewhereWarm Coding Standards</description>
-
-	<!-- Exclude paths -->
-	<exclude-pattern>tests/</exclude-pattern>
-	<exclude-pattern>*/node_modules/*</exclude-pattern>
-	<exclude-pattern>*/assets/*</exclude-pattern>
-	<exclude-pattern>*/src/*</exclude-pattern>
-	<exclude-pattern>*/vendor/*</exclude-pattern>
-
-	<!-- Configs -->
-	<config name="minimum_supported_wp_version" value="4.7" />
-	<config name="testVersion" value="5.6-" />
-
-	<!-- Rules -->
-	<rule ref="WooCommerce-Core">
-		<exclude name="Core.Commenting.CommentTags.AuthorTag" />
-		<exclude name="WordPress.PHP.DontExtract" />
-	</rule>
-
-	<rule ref="WordPress-Extra">
-		<exclude name="Generic.Commenting.DocComment.SpacingAfter" />
-		<exclude name="Generic.Files.LineEndings.InvalidEOLChar" />
-		<exclude name="Generic.Functions.FunctionCallArgumentSpacing.SpaceBeforeComma" />
-		<exclude name="Generic.WhiteSpace" />
-		<exclude name="PEAR.Functions.FunctionCallSignature" />
-		<exclude name="Squiz.Commenting" />
-		<exclude name="Squiz.PHP.DisallowSizeFunctionsInLoops.Found" />
-		<exclude name="Squiz.WhiteSpace" />
-		<exclude name="WordPress.Arrays" />
-		<exclude name="WordPress.Files.FileName" />
-		<exclude name="WordPress.NamingConventions" />
-		<exclude name="WordPress.Security.ValidatedSanitizedInput.MissingUnslash" />
-		<exclude name="WordPress.WP.I18n.NonSingularStringLiteralText" />
-		<exclude name="WordPress.WhiteSpace" />
-		<exclude name="WordPress.Security.EscapeOutput" />
-		<exclude name="Squiz.PHP.EmbeddedPhp" />
-	</rule>
-
-	<rule ref="PHPCompatibility">
-		<exclude-pattern>tests/</exclude-pattern>
-	</rule>
-
-	<rule ref="WordPress.Security.EscapeOutput">
-		<properties>
-			<!-- e.g. body_class, the_content, the_excerpt -->
-			<property name="customAutoEscapedFunctions" type="array" value="0=>woocommerce_wp_select,1=>wcs_help_tip,2=>admin_url,3=>wc_price"/>
-			<!-- e.g. esc_attr, esc_html, esc_url-->
-			<property name="customEscapingFunctions" type="array" value="0=>wcs_json_encode,1=>htmlspecialchars,2=>wp_kses_allow_underscores"/>
-			<!-- e.g. _deprecated_argument, printf, _e-->
-			<property name="customPrintingFunctions" type="array" value=""/>
-		</properties>
-	</rule>
-
-</ruleset>

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://cleverogre.com/
 Tags: gravityforms, feed, jobs, resume, application
 Requires at least: 6.0.0
 Tested up to: 6.4.3
-Stable tag: 0.1.1
+Stable tag: 0.1.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -28,6 +28,10 @@ If you do know what plugin you have downloaded, please contact [CleverOgre](team
 
 == Changelog ==
 
+= 0.1.2 - 2025-11-05 =
+* BUG: Allow theme-included ACF Pro as requirement.
+* DEV: Fixed minor build issues.
+
 = 0.1.1 - 2025-05-21 =
 * BUG: Fix `load_plugin_textdomain` deprecation.