Skip to content

Commit 551b036

Browse files
committed
Merge pull request #38 from danieltoader/sfv5
Symfony 4/5 package compatibility upgrade
2 parents a6559e4 + 7b05b05 commit 551b036

File tree

110 files changed

+2355
-1693
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+2355
-1693
lines changed

.coveralls.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
service_name: travis-ci

.gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/vendor/
2-
tests/app/cache/*
3-
tests/app/logs/*
4-
reports/
5-
composer.phar
6-
composer.lock
72
.idea/
3+
build
4+
bin
5+
/.phpunit.result.cache
6+
composer.phar
7+
composer.lock

.travis.yml

+36-21
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,45 @@
11
language: php
22

3+
sudo: false
4+
35
cache:
4-
directories:
5-
- $HOME/.composer
6+
directories:
7+
- $HOME/.composer
68

79
php:
8-
- 7.0
9-
- 7.1
10-
- 7.2
11-
12-
env:
13-
- SYMFONY_VERSION=3.0.*
14-
- SYMFONY_VERSION=3.1.*
15-
- SYMFONY_VERSION=3.2.*
16-
- SYMFONY_VERSION=3.3.*
10+
- 7.4
11+
- 8.0
12+
13+
matrix:
14+
include:
15+
- php: 7.4
16+
env:
17+
- SYMFONY_VERSION=5.1.*
18+
- COMPOSER_FLAGS="--prefer-stable"
19+
- php: 7.4
20+
env:
21+
- SYMFONY_VERSION=5.2.*
22+
- COMPOSER_FLAGS="--prefer-stable"
23+
- php: 8.0
24+
env:
25+
- SYMFONY_VERSION=5.1.*
26+
- COMPOSER_FLAGS="--prefer-stable"
27+
- php: 8.0
28+
env:
29+
- SYMFONY_VERSION=5.2.*
30+
- COMPOSER_FLAGS="--prefer-stable"
1731

1832
before_install:
19-
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/framework-bundle "$SYMFONY_VERSION"; fi
20-
21-
before_script:
22-
23-
- composer install
33+
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
34+
- |
35+
if [ "$SYMFONY_VERSION" != "" ]; then
36+
sed -ri 's/"symfony\/([^monolog].+)": "(.+)"/"symfony\/\1": "'$SYMFONY_VERSION'"/' composer.json;
37+
fi;
38+
install:
39+
- composer update $COMPOSER_FLAGS
2440

2541
script:
26-
- mkdir -p build/logs
27-
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
28-
29-
after_script:
30-
- php vendor/bin/coveralls -v
42+
- composer validate --strict --no-check-lock
43+
- mkdir -p build
44+
- composer run-script tests
45+
- composer run-script build

CODEOWNERS

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#####################################################
2+
#
3+
# List of approvers for EmagTechLabs/cache-bundle
4+
#
5+
#####################################################
6+
#
7+
# Learn about CODEOWNERS file format:
8+
# https://help.github.com/en/articles/about-code-owners
9+
#
10+
11+
* @danieltoader

CODE_OF_CONDUCT.md

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of
9+
experience, nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or reject
41+
comments, commits, code, wiki edits, issues, and other contributions that are
42+
not aligned to this Code of Conduct, or to ban temporarily or permanently any
43+
contributor for other behaviors that they deem inappropriate, threatening,
44+
offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team. All complaints
59+
will be reviewed and investigated and will result in a response that is deemed
60+
necessary and appropriate to the circumstances. The project team is obligated to
61+
maintain confidentiality with regard to the reporter of an incident. Further
62+
details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
71+
version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
72+
73+
[homepage]: http://contributor-covenant.org
74+
[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Contributing
2+
We greatly appreciate your input! We want to make contributing to this project as easy and transparent as possible,
3+
whether it is to:
4+
5+
- Report a bug
6+
- Discuss the current state of the code
7+
- Submit a fix
8+
- Propose new features
9+
- Become a maintainer
10+
11+
We have a simple to follow [code of conduct](CODE_OF_CONDUCT.md), and we kindly ask you to follow it in all your
12+
interactions with the project.
13+
14+
## We develop with Github
15+
We use github to host code, to track issues and feature requests, as well as accept pull requests.
16+
17+
### We use [Github Flow](https://guides.github.com/introduction/flow/index.html)
18+
All code changes Happen Through Pull Requests. Pull requests are the best way to propose changes to the codebase (we use
19+
[Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
20+
21+
1. Fork the repo and create your branch from `master`.
22+
2. If you've added code that should be tested, add tests.
23+
3. If you've changed APIs, update the documentation.
24+
4. Ensure the test suite passes.
25+
5. Make sure your code lints.
26+
6. Issue that pull request!
27+
28+
#### Pull request process
29+
30+
1. Ensure any build dependencies are removed before creating the the Pull Request.
31+
2. Update the README.md with details regarding the change.
32+
3. Increase the version numbers in any examples files and the README.md to the new version that this Pull Request would
33+
represent. The versioning scheme we use is [SemVer](http://semver.org/).
34+
4. The Pull Request will be merged in once you have the sign-off of at least one of the maintainer developers.
35+
36+
## Any contributions you make will be under the MIT Software License
37+
In short, when you submit code changes, your submissions are understood to be under the same [MIT License](LICENSE) that
38+
covers the project. Feel free to contact the maintainers if that's a concern.
39+
40+
## Report bugs using Github's [issues](https://github.com/eMAGTechLabs/annotation-cache-bundle/issues)
41+
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](); it's that easy!
42+
43+
## Write bug reports with detail, background, and sample code
44+
**Great Bug Reports** tend to have:
45+
46+
- A quick summary and/or background
47+
- Steps to reproduce
48+
- Be specific!
49+
- Give sample code if you can.
50+
- What you expected would happen
51+
- What actually happens
52+
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
53+
54+
People *love* thorough bug reports. I'm not even kidding.
55+
56+
## License
57+
By contributing, you agree that your contributions will be licensed under its MIT License.

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 eMAG IT Research
3+
Copyright (c) 2021 eMAG IT Research
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

MAINTAINERS.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# MAINTAINERS
2+
3+
This project is maintained by eMAG Recommendation Team.
4+
5+
Some maintainers for this project are:
6+
7+
- Daniel Toader ([@DanielToader](https://github.com/danieltoader))

MAINTAINERS_GUIDE.md

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Maintainers Guide
2+
3+
This guide is intended for maintainers - anybody with commit access to one or
4+
more repositories.
5+
6+
## Methodology
7+
8+
This repository does not have a traditional release management cycle, but
9+
should instead be maintained as a useful, working, and polished reference at
10+
all times. While all work can therefore be focused on the master branch, the
11+
quality of this branch should never be compromised.
12+
13+
The remainder of this document details how to merge pull requests to the
14+
repositories.
15+
16+
## Merge approval
17+
18+
The project maintainers use LGTM (Looks Good To Me) in comments on the pull
19+
request to indicate acceptance prior to merging. A change requires LGTMs from
20+
two project maintainers. If the code is written by a maintainer, the change
21+
only requires one additional LGTM.
22+
23+
## Reviewing Pull Requests
24+
25+
We recommend reviewing pull requests directly within GitHub. This allows a
26+
public commentary on changes, providing transparency for all users. When
27+
providing feedback be civil, courteous, and kind. Disagreement is fine, so long
28+
as the discourse is carried out politely. If we see a record of uncivil or
29+
abusive comments, we will revoke your commit privileges and invite you to leave
30+
the project.
31+
32+
During your review, consider the following points:
33+
34+
### Does the change have positive impact?
35+
36+
Some proposed changes may not represent a positive impact to the project. Ask
37+
whether or not the change will make understanding the code easier, or if it
38+
could simply be a personal preference on the part of the author (see
39+
[bikeshedding](https://en.wiktionary.org/wiki/bikeshedding)).
40+
41+
Pull requests that do not have a clear positive impact should be closed without
42+
merging.
43+
44+
### Do the changes make sense?
45+
46+
If you do not understand what the changes are or what they accomplish, ask the
47+
author for clarification. Ask the author to add comments and/or clarify test
48+
case names to make the intentions clear.
49+
50+
At times, such clarification will reveal that the author may not be using the
51+
code correctly, or is unaware of features that accommodate their needs. If you
52+
feel this is the case, work up a code sample that would address the pull
53+
request for them, and feel free to close the pull request once they confirm.
54+
55+
### Does the change introduce a new feature?
56+
57+
For any given pull request, ask yourself "is this a new feature?" If so, does
58+
the pull request (or associated issue) contain narrative indicating the need
59+
for the feature? If not, ask them to provide that information.
60+
61+
Are new unit tests in place that test all new behaviors introduced? If not, do
62+
not merge the feature until they are! Is documentation in place for the new
63+
feature? (See the documentation guidelines). If not do not merge the feature
64+
until it is! Is the feature necessary for general use cases? Try and keep the
65+
scope of any given component narrow. If a proposed feature does not fit that
66+
scope, recommend to the user that they maintain the feature on their own, and
67+
close the request. You may also recommend that they see if the feature gains
68+
traction among other users, and suggest they re-submit when they can show such
69+
support.

0 commit comments

Comments
 (0)