Skip to content
This repository has been archived by the owner on Nov 5, 2021. It is now read-only.

WIP: Upgrade dependencies, allow Symfony 4 #3

Merged
merged 5 commits into from
Jan 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php

php:
- 5.6
- 7
- 7.1
- 7.2

env:
matrix:
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class User

Requirements
------------
Works with PHP 5.6 or PHP 7.
Works with PHP 7.1 or higher.

Submitting bugs and feature requests
------------------------------------
Expand All @@ -65,6 +65,9 @@ Thanks [Vašek Purchart](http://www.vasekpurchart.cz/) for ideas how to test Sym
Changelog
----------

## 3.0.0 (2018-01-07)
- [#3](https://github.com/mhujer/jms-serializer-uuid-bundle/pull/3) Added Symfony 4.0 support, dropped support for Symfony 2. Requires PHP 7.1.

## 2.0.0 (2017-08-09)
- [#1](https://github.com/mhujer/jms-serializer-uuid-bundle/pull/1) Support for JMS Serializer Bundle 2.0 (thanks @VasekPurchart !)

Expand Down
21 changes: 11 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@
}
],
"require": {
"jms/serializer-bundle": "~1.0|~2.0",
"mhujer/jms-serializer-uuid": "~1.0",
"symfony/config": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0",
"symfony/yaml": "~2.7|~3.0"
"php": "^7.1",
"jms/serializer-bundle": "~1.0 || ~2.0",
"mhujer/jms-serializer-uuid": "~2.0",
"symfony/config": "~3.0 || ~4.0",
"symfony/dependency-injection": "~3.0 || ~4.0",
"symfony/http-kernel": "~3.0 || ~4.0",
"symfony/yaml": "~3.0 || ~4.0"
},
"require-dev": {
"consistence/coding-standard": "0.11",
"consistence/coding-standard": "2.3",
"jakub-onderka/php-parallel-lint": "0.9.2",
"matthiasnoback/symfony-dependency-injection-test": "0.7.6",
"phpunit/phpunit": "5.3.4",
"satooshi/php-coveralls": "1.0.1"
"matthiasnoback/symfony-dependency-injection-test": "2.3.0",
"phpunit/phpunit": "6.5.5",
"satooshi/php-coveralls": "2.0.0"
},
"autoload": {
"psr-4": { "Mhujer\\JmsSerializer\\Uuid\\SymfonyBundle\\": [ "src" ] },
Expand Down
4 changes: 1 addition & 3 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.3/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutChangesToGlobalState="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
checkForUnintentionallyCoveredCode="true"
>

<testsuites>
Expand Down
4 changes: 3 additions & 1 deletion src/DependencyInjection/MhujerJmsSerializerUuidExtension.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types = 1);

namespace Mhujer\JmsSerializer\Uuid\SymfonyBundle\DependencyInjection;

use Symfony\Component\Config\FileLocator;
Expand All @@ -9,7 +11,7 @@
class MhujerJmsSerializerUuidExtension extends \Symfony\Component\HttpKernel\DependencyInjection\Extension
{

const ALIAS = 'mhujer_jms_serializer_uuid';
private const ALIAS = 'mhujer_jms_serializer_uuid';

/**
* @param mixed[][] $configs
Expand Down
2 changes: 2 additions & 0 deletions src/MhujerJmsSerializerUuidBundle.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types = 1);

namespace Mhujer\JmsSerializer\Uuid\SymfonyBundle;

class MhujerJmsSerializerUuidBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types = 1);

namespace Mhujer\JmsSerializer\Uuid\SymfonyBundle\DependencyInjection;

use Mhujer\JmsSerializer\Uuid\UuidSerializerHandler;
Expand Down