Skip to content

Commit

Permalink
Merge 0.1.x into 0.2.x (#182)
Browse files Browse the repository at this point in the history
Merges the changes from the `0.1.x` branch into the `0.2.x` branch

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
  • Loading branch information
ghostwriter authored Feb 1, 2025
2 parents db9970d + bf32517 commit 69ff90c
Show file tree
Hide file tree
Showing 400 changed files with 8,340 additions and 3,745 deletions.
19 changes: 0 additions & 19 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,31 +1,12 @@
# Auto detect text files and perform LF normalization
* text=auto
*.bash text eol=lf
*.css text diff=css
*.gif binary
*.html text diff=html
*.ico binary
*.jpeg binary
*.jpg binary
*.lock text -diff
*.md text diff=markdown
*.php text eol=lf diff=php
*.phpt text eol=lf diff=php
*.phtml text eol=lf diff=html
*.png binary
*.py text diff=python
*.sh text eol=lf
*.svg text
*.txt text
*.webp binary
*.zip binary
/.editorconfig export-ignore
/.gitattributes export-ignore
/.github export-ignore
/.gitignore export-ignore
/composer.lock export-ignore
/infection.json5.dist export-ignore
/phpunit.xml.dist export-ignore
/psalm-baseline.xml export-ignore
/psalm.xml.dist export-ignore
/tests export-ignore
29 changes: 11 additions & 18 deletions .github/workflows/automation.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
name: Automation

on:
pull_request:
push:
pull_request: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request
push: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#push
branches:
# Default branch
- "main"
# Release branches
## 1.2.x - e.g. Semantic Versioning
- "[0-9]+.[0-9]+.x"
## v1 - e.g. GitHub Actions Versioning
- "v[0-9]+"
# Scheduled workflow
schedule:
# Runs hourly
- cron: "0 * * * *"
# Manually Trigger workflow
workflow_dispatch:
- "main" # Default branch
- "[0-9]+.[0-9]+.x" # Release branches (1.2.x - e.g. Semantic Versioning)
- "v[0-9]+" # v1 - e.g. GitHub Actions Versioning
schedule: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onschedule
- cron: "0 * * * *" # Runs hourly
workflow_dispatch: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatch

# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
# values: read, write, none
permissions:
permissions: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
# actions: Work with GitHub Actions. For example, actions: write permits an action to cancel a workflow run.
actions: write
# attestations: Work with artifact attestations. For example, attestations: write permits an action to generate an artifact attestation for a build.
attestations: write
# checks: Work with check runs and check suites. For example, checks: write permits an action to create a check run.
checks: write
# contents: Work with the contents of the repository. For example, contents: read permits an action to list the commits, and contents:write allows the action to create a release.
Expand Down Expand Up @@ -52,6 +46,5 @@ jobs:
automation:
uses: ghostwriter/compliance/.github/workflows/automation.yml@v1
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
INFECTION_DASHBOARD_API_KEY: ${{ secrets.INFECTION_DASHBOARD_API_KEY }}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2014-2024, Nathanael Esayeas
Copyright (c) 2014-2025, Nathanael Esayeas
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# AtProtocol
# Atprotocol

[![GitHub Sponsors](https://img.shields.io/github/sponsors/ghostwriter?label=Sponsor+@ghostwriter/atprotocol&logo=GitHub+Sponsors)](https://github.com/sponsors/ghostwriter)
[![Automation](https://github.com/ghostwriter/atprotocol/actions/workflows/automation.yml/badge.svg)](https://github.com/ghostwriter/atprotocol/actions/workflows/automation.yml)
[![Supported PHP Version](https://badgen.net/packagist/php/ghostwriter/atprotocol?color=8892bf)](https://www.php.net/supported-versions)
[![GitHub Sponsors](https://img.shields.io/github/sponsors/ghostwriter?label=Sponsor+@ghostwriter/atprotocol&logo=GitHub+Sponsors)](https://github.com/sponsors/ghostwriter)
[![Code Coverage](https://codecov.io/gh/ghostwriter/atprotocol/branch/main/graph/badge.svg)](https://codecov.io/gh/ghostwriter/atprotocol)
[![Type Coverage](https://shepherd.dev/github/ghostwriter/atprotocol/coverage.svg)](https://shepherd.dev/github/ghostwriter/atprotocol)
[![Psalm Level](https://shepherd.dev/github/ghostwriter/atprotocol/level.svg)](https://psalm.dev/docs/running_psalm/error_levels)
[![Latest Version on Packagist](https://badgen.net/packagist/v/ghostwriter/atprotocol)](https://packagist.org/packages/ghostwriter/atprotocol)
[![Downloads](https://badgen.net/packagist/dt/ghostwriter/atprotocol?color=blue)](https://packagist.org/packages/ghostwriter/atprotocol)

> [!WARNING]
Expand Down
55 changes: 36 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
"homepage": "https://github.com/ghostwriter/atprotocol",
"support": {
"issues": "https://github.com/ghostwriter/atprotocol/issues",
"forum": "https://github.com/ghostwriter/atprotocol/discussions",
"source": "https://github.com/ghostwriter/atprotocol",
"docs": "https://github.com/ghostwriter/atprotocol",
"rss": "https://github.com/ghostwriter/atprotocol/releases.atom",
"security": "https://github.com/ghostwriter/atprotocol/security/advisories/new"
},
Expand All @@ -35,25 +33,32 @@
"url": "https://github.com/sponsors/ghostwriter"
}
],
"_comment": "#BlackLivesMatter",
"_comment": [
"#BlackLivesMatter",
"#FreePalestine",
"#StandWithUkraine"
],
"require": {
"php": ">=8.3",
"ext-curl": "*",
"ghostwriter/collection": "^2.0.0",
"ghostwriter/config": "^0.4.1",
"ghostwriter/container": "^4.0.2",
"ghostwriter/container": "^4.0.3",
"ghostwriter/event-dispatcher": "^5.0.2",
"ghostwriter/http": "dev-main",
"ghostwriter/json": "^3.0.0",
"ghostwriter/option": "^1.5.1",
"ghostwriter/result": "^1.3.0",
"ghostwriter/uuid": "^1.0.1",
"laminas/laminas-diactoros": "^3.3.1",
"php-http/curl-client": "^2.3.2",
"ghostwriter/uuid": "^1.0.2",
"laminas/laminas-diactoros": "^3.5.0",
"php-http/curl-client": "^2.3.3",
"psr/http-client": "^1.0.3",
"psr/http-factory": "^1.1.0"
},
"require-dev": {
"ghostwriter/coding-standard": "dev-main"
"ghostwriter/coding-standard": "dev-main",
"ghostwriter/filesystem": "^0.1.1",
"ghostwriter/psalm-plugin": "dev-main"
},
"minimum-stability": "stable",
"prefer-stable": true,
Expand All @@ -64,12 +69,16 @@
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests"
}
"Tests\\Unit\\": "tests/unit/"
},
"exclude-from-classmap": [
"tests/fixture/"
]
},
"config": {
"allow-plugins": {
"ghostwriter/coding-standard": true,
"ghostwriter/handrail": true,
"php-http/discovery": true
},
"classmap-authoritative": false,
Expand All @@ -86,19 +95,27 @@
},
"scripts": {
"bin_ecs": "ecs check --clear-cache --no-interaction",
"bin_infection": "infection --ansi --show-mutations --threads=max --min-msi=0 --min-covered-msi=0",
"bin_phive": "phive",
"bin_phpunit": "phpunit --do-not-cache-result --colors=always",
"bin_psalm": "psalm --no-cache",
"bin_infection": [
"@xdebug",
"vendor/ghostwriter/coding-standard/tools/infection --ansi --show-mutations --threads=max --min-msi=0 --min-covered-msi=0"
],
"bin_phive": "vendor/ghostwriter/coding-standard/tools/phive",
"bin_phpunit": [
"@xdebug",
"vendor/ghostwriter/coding-standard/tools/phpunit --do-not-cache-result --colors=always"
],
"bin_psalm": "vendor/ghostwriter/coding-standard/tools/psalm --no-cache",
"bin_rector": "rector process --no-ansi --clear-cache",
"cache:clear": "rm -rf ./.cache/*",
"check": [
"@composer validate",
"vendor/ghostwriter/coding-standard/tools/composer validate",
"@ecs",
"@test"
],
"composer-normalize": "vendor/ghostwriter/coding-standard/tools/composer-normalize --no-cache --diff --no-check-lock --no-scripts --no-plugins",
"dev": [
"@cache:clear",
"@composer-normalize",
"@check",
"@psalm:update",
"@psalm:security",
Expand All @@ -113,7 +130,7 @@
"psalm:alter": "@bin_psalm --alter --allow-backwards-incompatible-changes=false --safe-types",
"psalm:baseline": "@psalm --no-diff --set-baseline=psalm-baseline.xml",
"psalm:dry-run": "@psalm:alter --issues=all --dry-run",
"psalm:fix": "@psalm:alter --issues=UnnecessaryVarAnnotation,MissingPureAnnotation,MissingImmutableAnnotation",
"psalm:fix": "@psalm:alter --issues=UnnecessaryVarAnnotation",
"psalm:security": "@psalm --no-diff --taint-analysis",
"psalm:shepherd": "@psalm --no-diff --shepherd --stats",
"psalm:update": "@psalm --no-diff --update-baseline=psalm-baseline.xml",
Expand All @@ -123,7 +140,7 @@
"@phpunit",
"@psalm:shepherd",
"@infection"
]
},
"$schema": "https://composerjs.org/schema.json"
],
"xdebug": "@putenv XDEBUG_MODE=coverage"
}
}
Loading

0 comments on commit 69ff90c

Please sign in to comment.