Skip to content

Commit

Permalink
Merge 3.x into 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Apr 25, 2023
2 parents 43dea04 + c3ddda4 commit cee5f5d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
9 changes: 6 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Closes #{put_issue_number_here}.

<!-- MANDATORY
Fill the changelog part inside the code block.
Follow this schema: http://keepachangelog.com/
Follow this schema: https://keepachangelog.com/
This will end up on https://github.com/sonata-project/exporter/releases,
please keep it short and clear and to the point
-->
Expand All @@ -34,10 +34,13 @@ Closes #{put_issue_number_here}.
(eg. update to docs, tests)
-->

<!-- REMOVE EMPTY SECTIONS -->
<!-- REMOVE EMPTY SECTIONS
- Don't repeat the verb in the messages (don't use "Added", "Changed", etc).
- Don't use a full stop at the end of the messages.
-->
```markdown
### Added
- Added some `Class::newMethod()` to do great stuff.
- Some `Class::newMethod()` to do great stuff

### Changed

Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ you using the latest patch version?

GitHub Issues is for **issues**, as opposed to question on how to use Sonata.
If you are not sure this is a bug, or simply want to ask such a question,
please post your question on [Stack Overflow](http://stackoverflow.com/questions/tagged/sonata),
please post your question on [Stack Overflow](https://stackoverflow.com/questions/tagged/sonata),
using the `sonata` tags.

If you happen to find a bug, we kindly request you report it. However,
Expand Down Expand Up @@ -79,11 +79,11 @@ But please, read the following before.

#### Coding style

Each project follows [PSR-1](http://www.php-fig.org/psr/psr-1/), [PSR-2](http://www.php-fig.org/psr/psr-2/)
and [Symfony Coding Standards](http://symfony.com/doc/current/contributing/code/standards.html) for coding style,
[PSR-4](http://www.php-fig.org/psr/psr-4/) for autoloading.
Each project follows [PSR-1](https://www.php-fig.org/psr/psr-1/), [PSR-2](https://www.php-fig.org/psr/psr-2/)
and [Symfony Coding Standards](https://symfony.com/doc/current/contributing/code/standards.html) for coding style,
[PSR-4](https://www.php-fig.org/psr/psr-4/) for autoloading.

Please [install PHP Coding Standard Fixer](http://cs.sensiolabs.org/#installation)
Please [install PHP Coding Standard Fixer](https://cs.symfony.com/#installation)
and run this command before committing your modifications:

```bash
Expand Down Expand Up @@ -207,13 +207,13 @@ Your note can be put on one of these sections:
* `Fixed` for any bug fixes.
* `Security` to invite users to upgrade in case of vulnerabilities.

More information about the followed changelog format: [keepachangelog.com](http://keepachangelog.com/)
More information about the followed changelog format: [keepachangelog.com](https://keepachangelog.com/)

#### Base branch

Before writing a PR, you have to check on which branch your changes SHOULD be based.

Each project follows [semver](http://semver.org/) convention for release management.
Each project follows [semver](https://semver.org/) convention for release management.

Here is a short table resuming on which you have to start:

Expand Down Expand Up @@ -329,7 +329,7 @@ If the deprecated thing is a service, you **MUST** specify it on the service def
</service>
```

More info: http://symfony.com/blog/new-in-symfony-2-8-deprecated-service-definitions
More info: https://symfony.com/blog/new-in-symfony-2-8-deprecated-service-definitions

For everything else, not managed by the `@deprecated` tag,
you **MUST** still trigger a deprecation message (and add a `NEXT_MAJOR` comment).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Check out the documentation on the [official website](https://docs.sonata-projec

## Support

For general support and questions, please use [StackOverflow](http://stackoverflow.com/questions/tagged/sonata).
For general support and questions, please use [StackOverflow](https://stackoverflow.com/questions/tagged/sonata).

If you think you found a bug or you have a feature idea to propose, feel free to open an issue
**after looking** at the [contributing guide](CONTRIBUTING.md).
Expand Down
6 changes: 6 additions & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ parameters:
checkMissingVarTagTypehint: true
checkMissingTypehints: true
checkUninitializedProperties: true
featureToggles:
skipCheckGenericClasses:
- Symfony\Component\Form\AbstractType
- Symfony\Component\Form\FormInterface
- Symfony\Component\Form\FormTypeExtensionInterface
- Symfony\Component\Form\FormTypeInterface
2 changes: 1 addition & 1 deletion src/Bridge/Symfony/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
final class Configuration implements ConfigurationInterface
{
/**
* @psalm-suppress PossiblyNullReference, PossiblyUndefinedMethod
* @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod
*
* @see https://github.com/psalm/psalm-plugin-symfony/issues/174
*/
Expand Down

0 comments on commit cee5f5d

Please sign in to comment.