Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/admin pages menu #1810

Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
283d3e7
convert to abstract
Camwyn Sep 6, 2022
0be3152
interim commit
Camwyn Sep 7, 2022
275f604
Architecture update.
Camwyn Sep 12, 2022
cea1e3b
Working menu
Camwyn Sep 12, 2022
2ea1eb7
Fix issue wth callback.
Camwyn Sep 12, 2022
7774e88
interim commit - working on submenus
Camwyn Sep 12, 2022
bbaeea1
interim commit
Camwyn Sep 14, 2022
8d5a825
Fix: setTime null param deprecation.
Camwyn Sep 14, 2022
d389e5b
Fix: deprecated constant.
Camwyn Sep 14, 2022
68a6f64
Merge branch 'release/B22.strudel' into feature/admin-pages-menu
Camwyn Sep 14, 2022
e27d522
Merge branch 'fix/PHP8.1-deprecation-notices' into feature/admin-page…
Camwyn Sep 14, 2022
019a12b
Fix: Don't pass null to strpos.
Camwyn Sep 14, 2022
03a576f
Merge branch 'fix/PHP8.1-deprecation-notices' into feature/admin-page…
Camwyn Sep 14, 2022
a2b02d5
derp
Camwyn Sep 14, 2022
4dd60f8
fix some permissions issues
Camwyn Sep 15, 2022
9495699
interim commit - working on submenus
Camwyn Sep 16, 2022
6d4b82b
Get submenus working consistently.
Camwyn Sep 19, 2022
4a80973
Some suggested tweaks (thanks @borkweb!)
Camwyn Sep 19, 2022
c9ffd06
Tweak some docblocks
Camwyn Sep 19, 2022
00a0ea0
Add filter to submenu
Camwyn Sep 19, 2022
49620c7
Interim commit
Camwyn Sep 22, 2022
6a2a670
Merge branch 'release/B22.strudel' into feature/admin-pages-menu
Camwyn Sep 23, 2022
9d4cdc1
Fix some function name collisions.
Camwyn Sep 24, 2022
834d74d
Add de-dupe functionality, change some methods to static
Camwyn Sep 26, 2022
05ff1f9
Add Taxonomy, Tabbed, and Settings.
Camwyn Sep 27, 2022
193adc9
add iconic to allowlist
Camwyn Sep 27, 2022
9d2ae53
Use composer 2
Camwyn Sep 27, 2022
5b571ac
more composer update
Camwyn Sep 27, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/submodule-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
tools: composer:v1
tools: composer:v2
env:
fail-fast: true

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ phpunit.xml
.env.local
.env.*.local
codeception.tric.yml
codeception.slic.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we used to ignore the tric configuration files in Common, but I think we should not: TEC and other plugins are including tric configuration files in VCS.

.env.testing.tric
.env.testing.slic

# Tests - local output files
tests/_output
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ env:
- WP_ADMIN_PASSWORD="password"

before_install:
# Rollback Composer to version 1.
- composer self-update --rollback
# Set Composer to version 2.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a good chance to move Common build away from Travis CI, as is the case for the other plugins, and just remove any configuration file related to it.

- composer self-update --2

# create the databases needed for the tests
- mysql -e "create database IF NOT EXISTS $DB_NAME;" -uroot
Expand Down
45 changes: 39 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,37 @@
"homepage": "https://theeventscalendar.com",
"license": "GPL-2.0",
"require-dev": {
"bordoni/phpass": "0.3.5",
"automattic/vipwpcs": "^2.0",
"bordoni/phpass": "0.3.5",
"brianhenryie/strauss": "^0.11.0",
"codeception/codeception": "^2.5.5",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"lucatume/codeception-snapshot-assertions": "^0.2.4",
"lucatume/function-mocker-le": "^1.0",
"lucatume/wp-browser": "^3.0.14",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update this to 3.1.6 (latest version).

"phpunit/phpunit": "~6.0",
"the-events-calendar/coding-standards": "dev-master",
"the-events-calendar/tec-testing-facilities": "dev-master",
"phpunit/phpunit": "~6.0",
"wp-cli/checksum-command": "1.0.5",
"wp-coding-standards/wpcs": "^2.1",
"lucatume/codeception-snapshot-assertions": "^0.2.4"
"wp-coding-standards/wpcs": "^2.1"
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"preferred-install": "dist",
"platform": {
"php": "7.3.33"
"php": "7.4.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minimum required version of PHP in the plugins is 7.3; the platform.php value should stay on 7.3.33.

},
"allow-plugins": {
"kylekatarnls/update-helper": true,
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"require": {
"lucatume/di52": "~2.1.5",
"firebase/php-jwt": "~5.0.0",
"monolog/monolog": "1.24.*"
"monolog/monolog": "1.24.*",
"iconicwp/wordpress-settings-framework": "dev-master"
},
"repositories": [
{
Expand All @@ -47,13 +53,24 @@
"type": "github",
"url": "https://github.com/the-events-calendar/coding-standards",
"no-api": true
},
{
"name": "iconicwp/wordpress-settings-framework",
"type": "github",
"url": "https://github.com/iconicwp/WordPress-Settings-Framework",
"no-api": true
}
],
"scripts": {
"strauss": [
"vendor/bin/strauss"
],
"post-install-cmd": [
"@strauss",
"xrstf\\Composer52\\Generator::onPostInstallCmd"
],
"post-update-cmd": [
"@strauss",
"xrstf\\Composer52\\Generator::onPostInstallCmd"
],
"post-autoload-dump": [
Expand All @@ -65,5 +82,21 @@
"Tribe\\": "src/Tribe/",
"TEC\\Common\\": "src/Common/"
}
},
"extra": {
"strauss": {
"target_directory": "vendor/strauss",
"namespace_prefix": "TEC\\Common\\",
"classmap_prefix": "TEC_",
"constant_prefix": "TEC_",
"packages": [
"vendor/iconicwp/wordpress-settings-framework"
],
"exclude_from_prefix": {
"packages": [
"dealerdirect/phpcodesniffer-composer-installer"
]
}
}
}
}
Loading