Skip to content

Commit

Permalink
Merge pull request #21 from niden/master
Browse files Browse the repository at this point in the history
v2.0.0
  • Loading branch information
niden authored Nov 24, 2023
2 parents 3bd72b4 + 76921d3 commit ec4d4cd
Show file tree
Hide file tree
Showing 28 changed files with 1,064 additions and 533 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 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://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "composer" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
15 changes: 15 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Hello!

* Type: bug fix | new feature | code quality | documentation
* Link to issue:

**In raising this pull request, I confirm the following:**

- [ ] I have read and understood the [Contributing Guidelines](https://github.com/phalcon/cli-options-parser/blob/master/CONTRIBUTING.md)
- [ ] I have checked that another pull request for this purpose does not exist
- [ ] I wrote some tests for this PR
- [ ] I have updated the relevant CHANGELOG

Small description of change:

Thanks
153 changes: 153 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
# This file is part of Phalcon.
#
# (c) Phalcon Team <[email protected]>
#
# For the full copyright and license information, please view
# the LICENSE file that was distributed with this source code.

name: "Phalcon CI"

on:
schedule:
- cron: '0 2 * * *' # Daily at 02:00 runs only on default branch
push:
paths-ignore:
- '**.md'
- '**.txt'
pull_request:
workflow_dispatch:

env:
fail-fast: true

# All versions should be declared here
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}

permissions: { }
jobs:

# PHP CodeSniffer inspection
phpcs:
name: "Validate Tests code style"
if: "!contains(github.event.head_commit.message, 'ci skip')"

permissions:
contents: read

runs-on: ubuntu-20.04

strategy:
fail-fast: true
matrix:
php:
- '8.0'
- '8.1'
- '8.2'

steps:
- uses: actions/checkout@v3

- name: "Setup PHP"
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
tools: pecl
env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: "Install development dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
composer-options: "--prefer-dist"

- name: "PHPCS"
run: |
vendor/bin/phpcs --standard=./phpcs.xml.dist
unit-tests:
needs: phpcs

permissions:
contents: read # to fetch code (actions/checkout)

name: Unit tests / PHP-${{ matrix.php }}
runs-on: ubuntu-latest

strategy:
matrix:
php:
- '8.0'
- '8.1'
- '8.2'

steps:
- uses: actions/checkout@v3
- name: "Setup platform specific environment"
shell: pwsh
run: |
git config --global core.autocrlf false
- name: "Setup PHP"
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
tools: pecl, composer:v2
coverage: xdebug
env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: "Validate composer"
run: composer validate --no-check-all --no-check-publish

- name: "Install development dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
composer-options: "--prefer-dist"

- name: "Run Unit Tests"
if: always()
run: |
composer test
upload-coverage:
needs: unit-tests

permissions:
contents: read # to fetch code (actions/checkout)

name: Code Coverage
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: "Setup platform specific environment"
shell: pwsh
run: |
git config --global core.autocrlf false
- name: "Setup PHP"
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
tools: pecl, composer:v2
coverage: xdebug
env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: "Validate composer"
run: composer validate --no-check-all --no-check-publish

- name: "Install development dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
composer-options: "--prefer-dist"

- name: "Run Unit Tests with coverage"
if: always()
run: |
composer test-coverage
- name: "Upload coverage to Codacy"
run: |
bash <(curl -Ls https://coverage.codacy.com/get.sh) \
report -r ./build/coverage.xml
75 changes: 0 additions & 75 deletions .travis.yml

This file was deleted.

Empty file added CHANGELOG.md
Empty file.
22 changes: 22 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Contributor Covenant Code of Conduct

## TL;DR

The project operates on common sense principles - treat others as you want to
be treated.

## Detail

This open-source project invites contributions from everyone, regardless of
the extent of their involvement. Personal opinions of contributors do not
influence the project and should remain personal.

Respect is mandatory when interacting within the project, whether with
contributors or maintainers. It is acceptable to agree to disagree.

## Conflict

In case of conflicts, please address them privately with the maintainers.
Reach us on [Discord](https://phalcon.io/discord) or via email at [[email protected]](mailto:[email protected])

The core team holds the final say in resolving any conflicts that may arise.
51 changes: 51 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Contributing to Phalcon

Phalcon is a volunteer-driven open-source project that encourages contributions
from all. Kindly take a moment to go through this document to facilitate a
smooth and effective contribution process for everyone.

Adhering to these guidelines demonstrates your consideration for the time and
efforts of the developers who oversee and advance this open-source project.
In return, they are expected to reciprocate this respect when addressing your
issues or evaluating patches and features.

## Contributions

Please submit contributions to Phalcon through GitHub pull requests. Each pull
request will undergo review by a core contributor, someone with the authority
to merge patches. Feedback may be given, and changes might be requested, or
the pull request will be merged. It is essential that all contributions,
including those from core contributors, adhere to this format.

## Questions & Support

We utilize GitHub issues to track bugs and feature requests, but due to limited
bandwidth, we can't address all of them. Consequently, we only accept bug
reports, new feature requests, and pull requests through GitHub. However, our
vibrant community and contributors are eager to assist you! Kindly utilize
these community resources for obtaining help.

_Prioritize consulting the [Documentation](https://phalcon.io/docs) before any other resource.
Additionally, you can employ the search feature in our documents to locate the
information you seek. If your question remains unanswered, explore the
additional options provided below._

* Questions should go to [GitHub Discussions](https://phalcon.io/discussions)
* Another way is to ask a question on [Stack Overflow](https://stackoverflow.com/) and tag it with [`phalcon`](https://stackoverflow.com/questions/tagged/phalcon)
* Come join the Phalcon [Discord](https://phalcon.io/discord)
* Our social network accounts are:
- [Telegram](https://phalcon.io/telegram)
- [Gab](https://phalcon.io/gab)
- [MeWe](https://phalcon.io/mewe)
- [Twitter](https://phalcon.io/t)
- [Facebook](https://phalcon.io/fb)
* If you still believe that what you found is a bug, please [open an issue](https://github.com/phalcon/cphalcon/issues/new)

Please report bugs when you've exhausted all of the above options.

## Requesting Features

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.

Thanks!
Phalcon Team
41 changes: 18 additions & 23 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
New BSD License
MIT License

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

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

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL PHALCON TEAM BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit ec4d4cd

Please sign in to comment.