Skip to content

Commit

Permalink
Require PHP 8.2+
Browse files Browse the repository at this point in the history
  • Loading branch information
olvlvl committed Nov 1, 2024
1 parent 9b10b69 commit 7e73e20
Show file tree
Hide file tree
Showing 18 changed files with 457 additions and 263 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
root = true

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

[{*.yaml,*.yml,*.neon,*.json}]
indent_size = 2
indent_style = space

[*.md]
indent_style = space
max_line_length = 100
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.github
* text=auto

.editorconfig export-ignore
.gitattributes export-ignore
.github export-ignore
.gitignore export-ignore
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
jobs:
phpunit:
name: phpunit
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
php-version:
- "7.3"
- "8.1"
- "8.2"
- "8.3"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -24,7 +24,7 @@ jobs:
ini-values: memory_limit=-1
tools: composer:v2
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.composer/cache
Expand All @@ -39,7 +39,7 @@ jobs:
run: make test-coveralls

- name: Upload code coverage
if: ${{ matrix.php-version == '7.3' }}
if: ${{ matrix.php-version == '8.3' }}
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand Down
12 changes: 12 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
build:
nodes:
analysis:
tests:
override:
- php-scrutinizer-run
environment:
php:
version: "8.2"
filter:
excluded_paths:
- 'tests/*'
28 changes: 26 additions & 2 deletions MIGRATION.md → CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
# Migration
# CHANGELOG

## v1.x to v2.x
## v2.x to v3.0

### New Requirements

Requires PHP 8.2+

### New features

None

### Backward Incompatible Changes

None

### Deprecated Features

None

### Other Changes

None



## v1.x to v2.0

### New Requirements

Expand Down
132 changes: 132 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, caste, color, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
<[email protected]>.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].

For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
at [https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org
[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
8 changes: 6 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

Contributions are **welcome** and will be fully **credited**.

We accept contributions via Pull Requests on [Github](https://github.com/ICanBoogie/Inflector).
We accept contributions via Pull Requests.

## Pull Requests

- **Add tests!** — Your contribution won't be accepted if it doesn't have tests.
- **Code style** — We're following a [Coding Standard][]. Check the code style with `make lint`.
- **Code health** — We're using [PHPStan][] to analyse the code, with maximum scrutiny. Check the code with `make lint`.
- **Add tests!** — Your contribution won't be accepted if it does not have tests.
- **Document any change in behaviour** — Make sure the `README.md` and any other relevant documentation are kept
up-to-date.
- **Consider our release cycle** — We follow [SemVer v2.0.0](http://semver.org/). Randomly breaking public APIs is not
Expand All @@ -25,4 +27,6 @@ coverage. The coverage report is available in `build/coverage/index.html`.
**Thanks for your contribution**!


[Coding Standard]: phpcs.xml
[git-squash]: http://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages
[PHPStan]: https://phpstan.org/user-guide/getting-started
46 changes: 33 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,38 @@
ARG PHP_VERSION
FROM php:${PHP_VERSION}-cli-alpine
ARG PHP_VERSION=8.2
FROM php:${PHP_VERSION}-cli-bookworm

RUN apk add --no-cache make && \
docker-php-ext-enable opcache && \
docker-php-source delete
RUN <<-EOF
apt-get update
apt-get install -y autoconf pkg-config
pecl channel-update pecl.php.net
pecl install xdebug
docker-php-ext-enable opcache xdebug
EOF

RUN echo $'\
display_errors=On\n\
error_reporting=E_ALL\n\
date.timezone=UTC\n\
' >> /usr/local/etc/php/conf.d/php.ini
RUN <<-EOF
cat <<-SHELL >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
xdebug.client_host=host.docker.internal
xdebug.mode=develop
xdebug.start_with_request=yes
SHELL

cat <<-SHELL >> /usr/local/etc/php/conf.d/php.ini
display_errors=On
error_reporting=E_ALL
date.timezone=UTC
SHELL
EOF

ENV COMPOSER_ALLOW_SUPERUSER 1

RUN curl -s https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && \
mv composer.phar /usr/local/bin/composer && \
echo $'export PATH="$HOME/.composer/vendor/bin:$PATH"\n' >> /root/.profile
RUN <<-EOF
apt-get update
apt-get install unzip
curl -s https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet
mv composer.phar /usr/local/bin/composer
cat <<-SHELL >> /root/.bashrc
export PATH="$HOME/.composer/vendor/bin:$PATH"
SHELL
EOF

RUN composer global require squizlabs/php_codesniffer
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The ICanBoogie/DateTime package is free software.
It is released under the terms of the following BSD License.

Copyright (c) 2013-2022 by Olivier Laviale
Copyright (c) 2013 by Olivier Laviale
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# customization

PACKAGE_NAME = ICanBoogie/DateTime
PHPUNIT = vendor/bin/phpunit

# do not edit the following lines
Expand All @@ -15,7 +14,7 @@ test-dependencies: vendor

.PHONY: test
test: test-dependencies
@$(PHPUNIT)
@$(PHPUNIT) $(ARGS)

.PHONY: test-coverage
test-coverage: test-dependencies
Expand All @@ -27,12 +26,15 @@ test-coveralls: test-dependencies
@mkdir -p build/logs
@XDEBUG_MODE=coverage $(PHPUNIT) --coverage-clover build/logs/clover.xml

.PHONY: test-container-73
test-container-73:
@docker-compose run --rm app73 sh
.PHONY: test-container
test-container: test-container-82

.PHONY: test-container-82
test-container-82:
@docker-compose run --rm app82 bash
@docker-compose down

.PHONY: test-container-81
test-container-81:
@docker-compose run --rm app81 sh
.PHONY: test-container-83
test-container-83:
@docker-compose run --rm app83 bash
@docker-compose down
15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# DateTime

[![Release](https://img.shields.io/packagist/v/ICanBoogie/DateTime.svg)](https://packagist.org/packages/icanboogie/datetime)
[![Coverage Status](https://coveralls.io/repos/github/ICanBoogie/DateTime/badge.svg?branch=2.0)](https://coveralls.io/github/ICanBoogie/DateTime?branch=2.0)
[![Packagist](https://img.shields.io/packagist/dm/icanboogie/datetime.svg)](https://packagist.org/packages/icanboogie/datetime)
[![Code Coverage](https://coveralls.io/repos/github/ICanBoogie/DateTime/badge.svg?branch=3.0)](https://coveralls.io/github/ICanBoogie/DateTime?branch=3.0)
[![Downloads](https://img.shields.io/packagist/dm/icanboogie/datetime.svg)](https://packagist.org/packages/icanboogie/datetime)

This package extends the features of PHP [DateTime](http://www.php.net/manual/en/class.datetime.php)
and [DateTimeZone](http://www.php.net/manual/en/class.datetimezone.php) classes to ease the
Expand Down Expand Up @@ -353,13 +353,20 @@ echo $date->localize('fr')->as_medium; // 5 mai 2015 23:13:05

The project is continuously tested by [GitHub actions](https://github.com/ICanBoogie/DateTime/actions).

[![Tests](https://github.com/ICanBoogie/DateTime/actions/workflows/test.yml/badge.svg?branch=2.0)](https://github.com/ICanBoogie/DateTime/actions/workflows/test.yml)
[![Tests](https://github.com/ICanBoogie/DateTime/actions/workflows/test.yml/badge.svg?branch=3.0)](https://github.com/ICanBoogie/DateTime/actions/workflows/test.yml)



## Code of Conduct

This project adheres to a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in
this project and its community, you're expected to uphold this code.



## Contributing

Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
See [CONTRIBUTING](CONTRIBUTING.md) for details.



Expand Down
Loading

0 comments on commit 7e73e20

Please sign in to comment.