Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: devanych/di-container
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.1.0
Choose a base ref
...
head repository: devanych/di-container
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 19 commits
  • 21 files changed
  • 1 contributor

Commits on Sep 6, 2020

  1. Copy the full SHA
    d93cb87 View commit details
  2. Copy the full SHA
    f57e4e0 View commit details
  3. Copy the full SHA
    e624c45 View commit details
  4. Copy the full SHA
    5d5f516 View commit details
  5. Copy the full SHA
    c88a833 View commit details
  6. Release version 2.1.1

    devanych committed Sep 6, 2020
    Copy the full SHA
    e7ddb34 View commit details

Commits on Sep 17, 2020

  1. Copy the full SHA
    f8cb3be View commit details
  2. Release version 2.1.2

    devanych committed Sep 17, 2020
    Copy the full SHA
    7591575 View commit details

Commits on Oct 1, 2020

  1. Copy the full SHA
    e684367 View commit details
  2. Copy the full SHA
    93312a9 View commit details
  3. Release version 2.1.3

    devanych committed Oct 1, 2020
    Copy the full SHA
    c8ae205 View commit details

Commits on Oct 20, 2020

  1. Copy the full SHA
    20f4434 View commit details
  2. Release version 2.1.4

    devanych committed Oct 20, 2020
    Copy the full SHA
    f4a7eee View commit details

Commits on Dec 12, 2020

  1. Copy the full SHA
    1182337 View commit details
  2. Update GitHub actions

    devanych committed Dec 12, 2020
    Copy the full SHA
    a89e9bf View commit details
  3. Release version 2.1.5

    devanych committed Dec 12, 2020
    Copy the full SHA
    0bd1caf View commit details

Commits on Dec 20, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    84a20a7 View commit details
  2. Release version 2.1.6

    devanych authored Dec 20, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ecc31f0 View commit details

Commits on Mar 27, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d02e7c3 View commit details
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -12,3 +12,6 @@ trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@
/.scrutinizer.yml export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/psalm.xml export-ignore
/psalm.xml.dist export-ignore
64 changes: 64 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Devanych Contributor Code of Conduct

## Our Pledge

As contributors and maintainers of this project, and in order to keep
community open and welcoming, we ask to respect all community members.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Personal attacks
* Trolling or insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other conduct which could reasonably be considered inappropriate in
a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in response
to any instances of unacceptable behavior.

Project maintainers 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, or to ban temporarily or permanently any contributor for other behaviors
that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when
an individual is representing the project or its community. Examples of representing
a project or community include posting via an official social media account,
within project GitHub, official forum or acting as an appointed representative at
an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported
by contacting core team members. All complaints will be reviewed and investigated
and will result in a response that is deemed necessary and appropriate to the circumstances.
The project team is obligated to maintain confidentiality with regard to the reporter of
an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith
may face temporary or permanent repercussions as determined by other members of
the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org),
version 1.4.0, available at [http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4).
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: Report errors and problems
labels: bug

---

**Description**
<!-- A clear and concise description of the problem. -->

**How to reproduce**
<!-- What steps will reproduce the problem. -->

**Expected result**
<!-- What is the expected result. -->

**Possible solution**
<!--- Optional: only if you have suggestions for fixing the bug. -->


**Additional info**

| Q | A
| ---------------- | ---
| Package version | ?.?.?
| PHP version |
| Operating system |
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: Feature Request
about: RFC and ideas for new features and improvements

---

**Description**
<!-- A clear and concise description of the new feature. -->

**Example**
<!-- A simple example of the new feature in action. -->
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/OTHER_QUESTION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: Other Question
about: Not related to bugs and new features

---

We use GitHub issues only to discuss bugs and new features.

Send all other questions and suggestions to [mail@devanych.ru](mailto:mail@devanych.ru).
6 changes: 6 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
| Q | A
| ------------- | ---
| Bug fix? | yes/no
| New feature? | yes/no
| Breaks BC? | yes/no
| Fixed issues | comma-separated list of a number tickets with a prefix "Fix #", if available, otherwise describe the problem below.
5 changes: 5 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Security Policy

Please send information about any security issue to [mail@devanych.ru](mailto:mail@devanych.ru). DO NOT use the issue tracker or discuss it in a public forum, as it will do more harm than good.

Please note that as a non-commercial OpenSource project we are not able to pay bounties at the moment.
152 changes: 73 additions & 79 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,84 +1,78 @@
on:
- pull_request
- push
pull_request:
paths-ignore:
- 'docs/**'
- 'README.md'
- 'CHANGELOG.md'
- '.gitignore'
- '.gitattributes'
- 'psalm.xml.dist'

push:
paths-ignore:
- 'docs/**'
- 'README.md'
- 'CHANGELOG.md'
- '.gitignore'
- '.gitattributes'
- 'psalm.xml.dist'

name: build

jobs:
tests:
name: PHP ${{ matrix.php-version }}
runs-on: ubuntu-latest
env:
extensions: curl, mbstring, dom
key: cache-v1

strategy:
matrix:
php-version:
- "7.4"
- "8.0"

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup cache environment
id: cache-env
uses: shivammathur/cache-extensions@v1
with:
php-version: ${{ matrix.php-version }}
extensions: ${{ env.extensions }}
key: ${{ env.key }}

- name: Cache extensions
uses: actions/cache@v2
with:
path: ${{ steps.cache-env.outputs.dir }}
key: ${{ steps.cache-env.outputs.key }}
restore-keys: ${{ steps.cache-env.outputs.key }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
extensions: ${{ env.extensions }}
ini-values: date.timezone='UTC'
coverage: pcov

- name: Determine composer cache directory
run: echo "::set-env name=COMPOSER_CACHE_DIR::$(composer config cache-dir)"

- name: Cache dependencies installed with composer
uses: actions/cache@v1
with:
path: ${{ env.COMPOSER_CACHE_DIR }}
key: php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: php-${{ matrix.php-version }}-composer-

- name: Install dependencies with composer php 7.4
if: matrix.php-version == '7.4'
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader

- name: Install dependencies with composer php 8.0
if: matrix.php-version == '8.0'
run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader

- name: PHPCS check
run: vendor/bin/phpcs

- name: Psalm static analysis
run: vendor/bin/psalm --no-progress

- name: PHPUnit run with coverage on PHP 7.4
if: matrix.php-version == '7.4'
run: vendor/bin/phpunit --coverage-clover=coverage.clover

- name: PHPUnit run without coverage on PHP 8.0
if: matrix.php-version == '8.0'
run: vendor/bin/phpunit

- name: Code coverage on PHP 7.4
if: matrix.php-version == '7.4'
run: |
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover coverage.clover
tests:
name: PHP ${{ matrix.php }}-${{ matrix.os }}

runs-on: ${{ matrix.os }}

env:
key: cache-v1

strategy:
matrix:
os:
- ubuntu-latest
- windows-latest

php:
- "7.4"
- "8.0"
- "8.1"
- "8.2"

steps:
- name: Checkout.
uses: actions/checkout@v3

- name: Install PHP with extensions.
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
ini-values: date.timezone='UTC'
tools: composer:v2
coverage: pcov

- name: Determine composer cache directory on Linux.
if: matrix.os == 'ubuntu-latest'
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV

- name: Determine composer cache directory on Windows.
if: matrix.os == 'windows-latest'
run: echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

- name: Cache dependencies installed with composer.
uses: actions/cache@v3
with:
path: ${{ env.COMPOSER_CACHE_DIR }}
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: |
php${{ matrix.php }}-composer-
- name: Update composer.
run: composer self-update

- name: Install dependencies with composer.
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi

- name: Run tests with phpunit.
run: vendor/bin/phpunit --colors=always
71 changes: 71 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
on:
pull_request:
paths-ignore:
- 'docs/**'
- 'README.md'
- 'CHANGELOG.md'
- '.gitignore'
- '.gitattributes'
- 'phpunit.xml.dist'

push:
paths-ignore:
- 'docs/**'
- 'README.md'
- 'CHANGELOG.md'
- '.gitignore'
- '.gitattributes'
- 'phpunit.xml.dist'

name: static

jobs:
static:
name: PHP ${{ matrix.php }}-${{ matrix.os }}

runs-on: ${{ matrix.os }}

strategy:
matrix:
os:
- ubuntu-latest

php:
- "7.4"
- "8.0"
- "8.1"
- "8.2"

steps:
- name: Checkout.
uses: actions/checkout@v3

- name: Install PHP with extensions.
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
ini-values: memory_limit=-1
tools: composer:v2

- name: Determine composer cache directory.
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV

- name: Cache dependencies installed with composer.
uses: actions/cache@v3
with:
path: ${{ env.COMPOSER_CACHE_DIR }}
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: |
php${{ matrix.php }}-composer-
- name: Update composer.
run: composer self-update

- name: Install dependencies with composer.
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi

- name: PHPCS check.
run: vendor/bin/phpcs

- name: Psalm static analysis.
run: vendor/bin/psalm --no-progress
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.phpunit.result.cache
composer.lock
phpunit.xml
vendor
psalm.xml
vendor
Loading