Skip to content

Commit ec4d4cd

Browse files
nidenniden
authored
Merge pull request #21 from niden/master
v2.0.0
2 parents 3bd72b4 + 76921d3 commit ec4d4cd

28 files changed

+1064
-533
lines changed

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "composer" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

‎.github/pull_request_template.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Hello!
2+
3+
* Type: bug fix | new feature | code quality | documentation
4+
* Link to issue:
5+
6+
**In raising this pull request, I confirm the following:**
7+
8+
- [ ] I have read and understood the [Contributing Guidelines](https://github.com/phalcon/cli-options-parser/blob/master/CONTRIBUTING.md)
9+
- [ ] I have checked that another pull request for this purpose does not exist
10+
- [ ] I wrote some tests for this PR
11+
- [ ] I have updated the relevant CHANGELOG
12+
13+
Small description of change:
14+
15+
Thanks

‎.github/workflows/continuous-integration.yml‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
# This file is part of Phalcon.
2+
#
3+
# (c) Phalcon Team <[email protected]>
4+
#
5+
# For the full copyright and license information, please view
6+
# the LICENSE file that was distributed with this source code.
7+
8+
name: "Phalcon CI"
9+
10+
on:
11+
schedule:
12+
- cron: '0 2 * * *' # Daily at 02:00 runs only on default branch
13+
push:
14+
paths-ignore:
15+
- '**.md'
16+
- '**.txt'
17+
pull_request:
18+
workflow_dispatch:
19+
20+
env:
21+
fail-fast: true
22+
23+
# All versions should be declared here
24+
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
25+
26+
permissions: { }
27+
jobs:
28+
29+
# PHP CodeSniffer inspection
30+
phpcs:
31+
name: "Validate Tests code style"
32+
if: "!contains(github.event.head_commit.message, 'ci skip')"
33+
34+
permissions:
35+
contents: read
36+
37+
runs-on: ubuntu-20.04
38+
39+
strategy:
40+
fail-fast: true
41+
matrix:
42+
php:
43+
- '8.0'
44+
- '8.1'
45+
- '8.2'
46+
47+
steps:
48+
- uses: actions/checkout@v3
49+
50+
- name: "Setup PHP"
51+
uses: shivammathur/setup-php@v2
52+
with:
53+
php-version: ${{ matrix.php }}
54+
tools: pecl
55+
env:
56+
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57+
58+
- name: "Install development dependencies with Composer"
59+
uses: "ramsey/composer-install@v2"
60+
with:
61+
composer-options: "--prefer-dist"
62+
63+
- name: "PHPCS"
64+
run: |
65+
vendor/bin/phpcs --standard=./phpcs.xml.dist
66+
67+
unit-tests:
68+
needs: phpcs
69+
70+
permissions:
71+
contents: read # to fetch code (actions/checkout)
72+
73+
name: Unit tests / PHP-${{ matrix.php }}
74+
runs-on: ubuntu-latest
75+
76+
strategy:
77+
matrix:
78+
php:
79+
- '8.0'
80+
- '8.1'
81+
- '8.2'
82+
83+
steps:
84+
- uses: actions/checkout@v3
85+
- name: "Setup platform specific environment"
86+
shell: pwsh
87+
run: |
88+
git config --global core.autocrlf false
89+
90+
- name: "Setup PHP"
91+
uses: shivammathur/setup-php@v2
92+
with:
93+
php-version: ${{ matrix.php }}
94+
tools: pecl, composer:v2
95+
coverage: xdebug
96+
env:
97+
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
98+
99+
- name: "Validate composer"
100+
run: composer validate --no-check-all --no-check-publish
101+
102+
- name: "Install development dependencies with Composer"
103+
uses: "ramsey/composer-install@v2"
104+
with:
105+
composer-options: "--prefer-dist"
106+
107+
- name: "Run Unit Tests"
108+
if: always()
109+
run: |
110+
composer test
111+
112+
upload-coverage:
113+
needs: unit-tests
114+
115+
permissions:
116+
contents: read # to fetch code (actions/checkout)
117+
118+
name: Code Coverage
119+
runs-on: ubuntu-latest
120+
121+
steps:
122+
- uses: actions/checkout@v3
123+
- name: "Setup platform specific environment"
124+
shell: pwsh
125+
run: |
126+
git config --global core.autocrlf false
127+
128+
- name: "Setup PHP"
129+
uses: shivammathur/setup-php@v2
130+
with:
131+
php-version: 8.0
132+
tools: pecl, composer:v2
133+
coverage: xdebug
134+
env:
135+
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136+
137+
- name: "Validate composer"
138+
run: composer validate --no-check-all --no-check-publish
139+
140+
- name: "Install development dependencies with Composer"
141+
uses: "ramsey/composer-install@v2"
142+
with:
143+
composer-options: "--prefer-dist"
144+
145+
- name: "Run Unit Tests with coverage"
146+
if: always()
147+
run: |
148+
composer test-coverage
149+
150+
- name: "Upload coverage to Codacy"
151+
run: |
152+
bash <(curl -Ls https://coverage.codacy.com/get.sh) \
153+
report -r ./build/coverage.xml

‎.travis.yml‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎CHANGELOG.md‎

Whitespace-only changes.

‎CODE_OF_CONDUCT.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## TL;DR
4+
5+
The project operates on common sense principles - treat others as you want to
6+
be treated.
7+
8+
## Detail
9+
10+
This open-source project invites contributions from everyone, regardless of
11+
the extent of their involvement. Personal opinions of contributors do not
12+
influence the project and should remain personal.
13+
14+
Respect is mandatory when interacting within the project, whether with
15+
contributors or maintainers. It is acceptable to agree to disagree.
16+
17+
## Conflict
18+
19+
In case of conflicts, please address them privately with the maintainers.
20+
Reach us on [Discord](https://phalcon.io/discord) or via email at [[email protected]](mailto:[email protected])
21+
22+
The core team holds the final say in resolving any conflicts that may arise.

‎CONTRIBUTING.md‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Contributing to Phalcon
2+
3+
Phalcon is a volunteer-driven open-source project that encourages contributions
4+
from all. Kindly take a moment to go through this document to facilitate a
5+
smooth and effective contribution process for everyone.
6+
7+
Adhering to these guidelines demonstrates your consideration for the time and
8+
efforts of the developers who oversee and advance this open-source project.
9+
In return, they are expected to reciprocate this respect when addressing your
10+
issues or evaluating patches and features.
11+
12+
## Contributions
13+
14+
Please submit contributions to Phalcon through GitHub pull requests. Each pull
15+
request will undergo review by a core contributor, someone with the authority
16+
to merge patches. Feedback may be given, and changes might be requested, or
17+
the pull request will be merged. It is essential that all contributions,
18+
including those from core contributors, adhere to this format.
19+
20+
## Questions & Support
21+
22+
We utilize GitHub issues to track bugs and feature requests, but due to limited
23+
bandwidth, we can't address all of them. Consequently, we only accept bug
24+
reports, new feature requests, and pull requests through GitHub. However, our
25+
vibrant community and contributors are eager to assist you! Kindly utilize
26+
these community resources for obtaining help.
27+
28+
_Prioritize consulting the [Documentation](https://phalcon.io/docs) before any other resource.
29+
Additionally, you can employ the search feature in our documents to locate the
30+
information you seek. If your question remains unanswered, explore the
31+
additional options provided below._
32+
33+
* Questions should go to [GitHub Discussions](https://phalcon.io/discussions)
34+
* Another way is to ask a question on [Stack Overflow](https://stackoverflow.com/) and tag it with [`phalcon`](https://stackoverflow.com/questions/tagged/phalcon)
35+
* Come join the Phalcon [Discord](https://phalcon.io/discord)
36+
* Our social network accounts are:
37+
- [Telegram](https://phalcon.io/telegram)
38+
- [Gab](https://phalcon.io/gab)
39+
- [MeWe](https://phalcon.io/mewe)
40+
- [Twitter](https://phalcon.io/t)
41+
- [Facebook](https://phalcon.io/fb)
42+
* If you still believe that what you found is a bug, please [open an issue](https://github.com/phalcon/cphalcon/issues/new)
43+
44+
Please report bugs when you've exhausted all of the above options.
45+
46+
## Requesting Features
47+
48+
If you have a change or new feature in mind, please fill a [NFR](https://docs.phalcon.io/en/latest/new-feature-request) on GitHub.
49+
50+
Thanks!
51+
Phalcon Team

‎LICENSE‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
1-
New BSD License
1+
MIT License
22

3-
Copyright (c) 2011-present, Phalcon Team
4-
All rights reserved.
3+
Copyright (c) 2011-present The Phalcon PHP Framework
54

6-
Redistribution and use in source and binary forms, with or without
7-
modification, are permitted provided that the following conditions are met:
8-
* Redistributions of source code must retain the above copyright
9-
notice, this list of conditions and the following disclaimer.
10-
* Redistributions in binary form must reproduce the above copyright
11-
notice, this list of conditions and the following disclaimer in the
12-
documentation and/or other materials provided with the distribution.
13-
* Neither the name of the Phalcon nor the
14-
names of its contributors may be used to endorse or promote products
15-
derived from this software without specific prior written permission.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1611

17-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20-
DISCLAIMED. IN NO EVENT SHALL PHALCON TEAM BE LIABLE FOR ANY
21-
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24-
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)