Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
WengerK committed Jun 27, 2024
2 parents a5fbb74 + 9aae3ec commit cb58a89
Show file tree
Hide file tree
Showing 58 changed files with 5,565 additions and 2,496 deletions.
3 changes: 3 additions & 0 deletions .chanrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"release-prefix": ""
}
2 changes: 1 addition & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
service_name: travis-ci
service_name: github-actions

# for php-coveralls
coverage_clover: build/logs/clover.xml
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Drupal editor configuration normalization
# @see http://editorconfig.org/

# This is the top-most .editorconfig file; do not search in parent directories.
root = true

# All files.
[*]
end_of_line = LF
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[composer.{json,lock}]
indent_size = 2
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: "🚨 Bug report"
about: Create a report to help us improve the project
title: ''
labels: 'type: Bug'
assignees: ''
---

### 💬 Describe the bug
A clear and concise description of what the bug is.

### 🔢 To Reproduce
Steps to reproduce the behaviour:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

### 🧞 Expected behaviour
A clear and concise description of what you expected to happen.

### 📸 Screenshots
If applicable, add screenshots to help explain your problem.

### ⚙️ Additional context
Add any other context about the problem here.

17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: "☝️ Feature request"
about: Suggest an idea for this project
title: ''
labels: 'type: New feature'
assignees: ''
---

### 💬 Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

### 🧞 Describe the solution you'd like
A clear and concise description of what you want to happen.

### ☝️ Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/review.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: "🔬 Review"
about: Create a new review issue
title: ''
labels: 'type: Review'
assignees: ''
---

### 💬 Describe the context
A clear and concise description of what the review is about.

### ✅ To modify
List of required modifications:
- [ ] Do that
- [ ] Change this

### 📸 Screenshots
If needed, add screenshots to help explain your review.
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/task.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: "☑️ Task"
about: Task issue
title: ''
labels: ''
assignees: ''
---

### 💬 Describe the task
A clear and concise description of what the task is about.

### ✅ Todo
Steps to achieve the task:
- [ ] Do that
- [ ] Produce this

### 🧞 Expected result
A clear and concise description of what you expected to produce.

### 📸 Screenshots
If applicable, add screenshots to help explain the task.
19 changes: 19 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: composer
directory: "/"
versioning-strategy: lockfile-only
allow:
- dependency-type: production
schedule:
interval: weekly
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly

16 changes: 16 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
### 💬 Describe the pull request
A clear and concise description of what the pull request is about.

### 🗃️ Issues
This pull request is related to :
- #1

### 🔢 To Review
Steps to review the PR:
1. Install '...'
2. Go to '...'
3. Click on '....'
4. Scroll down to '....'

### 📸 Screenshots
If applicable, add screenshots to help explain the task.
56 changes: 56 additions & 0 deletions .github/workflows/styles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Code styles
on:
push:
schedule:
- cron: '0 0 * * THU'

jobs:
php-cs-fixer:
name: php-cs-fixer
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv
tools: php-cs-fixer, cs2pr
- uses: actions/checkout@v4
- run: composer install --prefer-dist
- run: ./vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -v --dry-run --using-cache=no --format=checkstyle | cs2pr

phpmd:
name: phpmd
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv
- uses: actions/checkout@v4
- run: composer install --prefer-dist
- run: ./vendor/bin/phpmd ./ text ./phpmd.xml --suffixes php,inc,test --exclude vendor,bin,tests,examples

psalm:
name: psalm
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv
- uses: actions/checkout@v4
- run: composer install --prefer-dist
- run: ./vendor/bin/psalm --output-format=github

security-checker:
name: security-checker
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
tools: composer:v2
- uses: actions/checkout@v4
- run: composer install --prefer-dist
- uses: symfonycorp/security-checker-action@v3
34 changes: 34 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Tests
on:
push:
schedule:
- cron: '0 0 * * THU'

jobs:
tests:
runs-on: ubuntu-latest
env:
TRUSTEDSHOPS_LOGIN: ${{ secrets.TRUSTEDSHOPS_LOGIN }}
TRUSTEDSHOPS_PASS: ${{ secrets.TRUSTEDSHOPS_PASS }}
TRUSTEDSHOPS_TSID: ${{ secrets.TRUSTEDSHOPS_TSID }}
strategy:
matrix:
php-versions: ['8.0', '8.1', '8.2', '8.3']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
tools: composer:v2
- uses: actions/checkout@v4
- uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php-versions }}
version: 2
- run: XDEBUG_MODE=coverage ./vendor/bin/phpunit
- name: Upload coverage results to Coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
run: |
composer global require php-coveralls/php-coveralls
php-coveralls --coverage_clover=build/logs/clover.xml -v
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@

# Ignore build
/build/

# Ignore log & cache files
.php-cs-fixer.cache
.php_cs.cache
.phpunit.result.cache
15 changes: 15 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

$finder = \PhpCsFixer\Finder::create()
->exclude('vendor')
->exclude('.sonarlint')
->in(__DIR__);

$config = new \PhpCsFixer\Config();

return $config->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'phpdoc_align' => ['align' => 'vertical', 'tags' => ['type', 'var']],
])
->setFinder($finder);
16 changes: 0 additions & 16 deletions .php_cs.dist

This file was deleted.

13 changes: 0 additions & 13 deletions .styleci.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

64 changes: 48 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,48 @@
CHANGELOG
---------

## 1.0.0 (2019-10-08)
- Initial release
- Refactoring of testing strategy
- Improve code coverage to ensure stability and sustainability

## 0.0.1-alpha (2019-09-27)
- Alpha release
- Allow GET, POST, PUT, PATCH & DELETE operation on the TrustedShops API
- Allow Public and Restricted API calls
- Expose an option to change the Base URL from Production to Test/QA environment

## 0.0.0 (2019-09-09)
- Under heavy development
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.1.0] - 2024-06-27
### Added
- add Github Actions integration
- add Psalm linter
- add .editorconfig file
- add coveralls phpunit coverage upload
- add coverage on cURL availability tests
- add support for PHP 8.0, 8.1 & 8.2
- add security-checker on Github Actions

### Security
- ugprade phpunit/phpunit 7.x => 8.x
- update phpmd/phpmd (2.7.0 => 2.15.0)
- guzzlehttp/guzzle (6.3.3 => 7.8.1)
- symfony/dotenv (v4.3.4 => v4.4.37)
- guzzlehttp/psr7 (1.6.1 => 2.6.2)
- upgrade friendsofphp/php-cs-fixer (v2.19.3 => v3.4.0)
- upgrade phpunit/phpunit 8.x -> 9.x

### Removed
- remove StyleCI in favor of Github Actions
- drop support for PHP 7.4 and below

## 1.0.0 - 2019-10-08
### Changed
- refactoring of testing strategy
- improve code coverage to ensure stability and sustainability

## 0.0.1-alpha - 2019-09-27
### Added
- allow GET, POST, PUT, PATCH & DELETE operation on the TrustedShops API
- allow Public and Restricted API calls
- expose an option to change the Base URL from Production to Test/QA environment

## 0.0.0 - 2019-09-09
### Added
- under heavy development

[Unreleased]: https://github.com/antistatique/trustedshops-php-sdk/compare/1.1.0...HEAD
[1.1.0]: https://github.com/antistatique/trustedshops-php-sdk/compare/1.0.0...1.1.0
Loading

0 comments on commit cb58a89

Please sign in to comment.