Skip to content

Commit

Permalink
Merge branch 'master' into bucket/phpstan-and-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Camwyn committed Mar 20, 2024
2 parents 10bbc9d + 4f84ad0 commit bc3dc70
Show file tree
Hide file tree
Showing 706 changed files with 40,275 additions and 29,485 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_style = tab
insert_final_newline = false
trim_trailing_whitespace = true

[**.{jshintrc,json,scss-lint,yml}]
indent_style = space
indent_size = 2
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/resources/js/**/*.min.js
5 changes: 1 addition & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@
*.min.js linguist-generated=true
tests/_support/_generated/* linguist-generated=true
*/__snapshots__/* linguist-generated=true
*/__mocks__/* linguist-generated=true

readme.txt export-ignore
tribe-common.php export-ignore
*/__mocks__/* linguist-generated=true
27 changes: 27 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
### 🎫 Ticket

[TICKET_ID]
<!-- Ticket ID, if there's any put it between brackets -->

### 🗒️ Description

<!--
Please describe what you have changed or added
What types of changes does your code introduce?
Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Include any important information for reviewers
-->

### 🎥 Artifacts <!-- if applicable-->
<!-- 🎥 screencast(s) or 📷 screenshot(s) -->

### ✔️ Checklist
- [ ] Changelog entry in the `readme.txt` file.
- [ ] Code is covered by **NEW** `wpunit` or `integration` tests.
- [ ] Code is covered by **EXISTING** `wpunit` or `integration` tests.
- [ ] Are all the **required** tests passing?
- [ ] Automated code review comments are addressed.
- [ ] Have you added Artifacts?
- [ ] Check the base branch for your PR.
- [ ] Add your PR to the project board for the release.
14 changes: 14 additions & 0 deletions .github/workflows/link-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Link to Release Project'
on: [pull_request]
jobs:
link-project:
name: 'Link to Release Project'
runs-on: ubuntu-latest
steps:
- uses: the-events-calendar/gh-action-project-link@main
with:
github-token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
template-project-url: https://github.com/orgs/the-events-calendar/projects/29
project-owner: 'tec-bot'
base-branch-pattern: 'release/*'
name-prefix-remove: 'release/'
5 changes: 2 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: 'npm lint'
on:
pull_request:
workflow_dispatch:
paths:
- 'src/modules/**.js'
- 'src/resources/js/**.js'
Expand Down Expand Up @@ -29,6 +30,4 @@ jobs:
. ~/.nvm/nvm.sh && nvm use && npm ci
- name: Run linting tasks
run: |
. ~/.nvm/nvm.sh && nvm use && npm run lint
. ~/.nvm/nvm.sh && nvm use && npm run lint
2 changes: 1 addition & 1 deletion .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ jobs:
with:
ref: ${{ github.event.inputs.ref }}
secrets:
access-token: ${{ secrets.GH_BOT_TOKEN }}
access-token: ${{ secrets.GH_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.13.0
18.13.0
4 changes: 4 additions & 0 deletions .phpstorm.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace PHPSTORM_META {

// Allow PhpStorm IDE to resolve return types when calling tribe( Object_Type::class ) or tribe( `Object_Type` )
use TEC\Common\StellarWP\ContainerContract\ContainerInterface;

override(
\tribe(),
map( [
Expand Down Expand Up @@ -49,4 +51,6 @@
'' => '@class',
] )
);

override( ContainerInterface::get( 0 ), type( 0 ) );
}
16 changes: 1 addition & 15 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
{
"extends": "@the-events-calendar/product-taskmaster/config/stylelint",
"rules": {
"font-family-no-missing-generic-family-keyword": [
true,
{
"ignoreFontFamilies": [ "dashicons" ],
}
],
"property-no-unknown": [
true,
{
"ignoreProperties": [ "font-smoothing" ]
}
]
}
"extends": "@the-events-calendar/product-taskmaster/config/stylelint"
}
60 changes: 20 additions & 40 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"name": "the-events-calendar/tribe-common",
"description": "Common classes and functions used in our plugins",
"type": "wordpress-plugin",
"keywords": [
"wordpress",
"events"
],
"homepage": "https://theeventscalendar.com",
"license": "GPL-2.0",
"minimum-stability": "dev",
"prefer-stable": true,
"keywords": [
"wordpress",
"events"
],
"config": {
"preferred-install": "dist",
"platform": {
Expand All @@ -22,12 +22,14 @@
},
"require": {
"firebase/php-jwt": "~6.3.0",
"lucatume/di52": "^3.3.0",
"lucatume/di52": "^3.3.4",
"monolog/monolog": "1.24.*",
"psr/container": "^1.0.0",
"stellarwp/container-contract": "^1.0.4",
"stellarwp/db": "^1.0.3",
"stellarwp/installer": "^1.1.0",
"stellarwp/schema": "^1.1.3",
"stellarwp/models": "dev-main",
"stellarwp/telemetry": "^2.3.1"
},
"require-dev": {
Expand All @@ -48,31 +50,18 @@
"wp-cli/checksum-command": "1.0.5",
"wp-coding-standards/wpcs": "^3.0"
},
"repositories": [
{
"name": "the-events-calendar/tec-testing-facilities",
"type": "github",
"url": "https://github.com/the-events-calendar/tec-testing-facilities",
"no-api": true
},
{
"name": "the-events-calendar/coding-standards",
"type": "github",
"url": "https://github.com/the-events-calendar/coding-standards",
"no-api": true
},
{
"name": "lucatume/di52",
"type": "github",
"url": "https://github.com/lucatume/di52",
"no-api": true
},
{
"name": "stellarwp/telemetry",
"type": "vcs",
"url": "git@github.com:stellarwp/telemetry.git"
"autoload": {
"psr-4": {
"Tribe\\": "src/Tribe/",
"TEC\\Common\\": "src/Common/"
}
],
},
"autoload-dev": {
"psr-4": {
"TEC\\Common\\Tests\\": "tests/_data/classes",
"TEC\\Common\\Tests\\Provider\\": "tests/_support/Provider"
}
},
"scripts": {
"strauss": [
"test -f ./bin/strauss.phar || curl -o bin/strauss.phar -L -C - https://github.com/BrianHenryIE/strauss/releases/download/0.13.0/strauss.phar",
Expand All @@ -86,17 +75,6 @@
"@strauss"
]
},
"autoload": {
"psr-4": {
"Tribe\\": "src/Tribe/",
"TEC\\Common\\": "src/Common/"
}
},
"autoload-dev": {
"psr-4": {
"TEC\\Common\\Tests\\": "tests/_data/classes"
}
},
"extra": {
"strauss": {
"target_directory": "vendor/vendor-prefixed",
Expand All @@ -106,6 +84,8 @@
"packages": [
"stellarwp/container-contract",
"stellarwp/db",
"stellarwp/models",
"stellarwp/schema",
"stellarwp/installer",
"stellarwp/telemetry",
"lucatume/di52",
Expand Down
Loading

0 comments on commit bc3dc70

Please sign in to comment.