Skip to content

Commit

Permalink
Fix version of icalcreator php package library to v2.22 (#1)
Browse files Browse the repository at this point in the history
* Stable icalcreator php library
* fix travic ci
* fix travis env matrix
* update supported php version for symfony master version
* remove stability info for non-versioned package
* install phpunit via composer
* require phpunit 6.3 for php7.1
* drop automated tests for symfony master and add tests for v3.x minor versions
  • Loading branch information
fdyckhoff committed Aug 18, 2017
1 parent 4535ae2 commit eeca3e3
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 61 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.idea
composer.lock
vendor
25 changes: 15 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,30 @@ php:
- 5.5
- 5.6
- 7.0
- 7.1

env:
- SYMFONY_VERSION=2.3.*
- SYMFONY_VERSION=2.7.*
- SYMFONY_VERSION=2.8.*
- SYMFONY_VERSION=3.0.*
- SYMFONY_VERSION=3.1.*
- SYMFONY_VERSION=dev-master
- ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=2.3.*
- ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=2.7.*
- ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=2.8.*
- ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.0.*
- ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.1.*
- ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.2.*
- ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.3.*

matrix:
exclude:
- php: 5.4
env: SYMFONY_VERSION=3.0.*
env: ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.0.*
- php: 5.4
env: SYMFONY_VERSION=3.1.*
env: ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.1.*
- php: 5.4
env: SYMFONY_VERSION=dev-master
env: ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.2.*
- php: 5.4
env: ICALCREATOR_VERSION=2.22.* SYMFONY_VERSION=3.3.*

before_install:
- composer require "kigkonsult/icalcreator:${ICALCREATOR_VERSION}" --no-update
- composer require "symfony/config:${SYMFONY_VERSION}" --no-update
- composer require "symfony/dependency-injection:${SYMFONY_VERSION}" --no-update
- composer require "symfony/http-foundation:${SYMFONY_VERSION}" --no-update
Expand All @@ -33,4 +38,4 @@ install:
- composer update --prefer-source

script:
- phpunit --coverage-text
- vendor/bin/phpunit --coverage-text
12 changes: 1 addition & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,7 @@ Download via [Composer](https://getcomposer.org/)
composer require dyvelop/icalcreator-bundle
```

This project requires the packagist distribution from https://github.com/iCalcreator/iCalcreator which is currently only available in the `dev-master` branch. (which is equals to version 2.22 from http://kigkonsult.se/iCalcreator/index.php)
Because there isn't any tagged version yet, you may need to change the minimal stability to "dev" in the `composer.json` of your Symfony project:

```
{
...
"minimum-stability": "dev"
}
```

See [iCalcreator/iCalcreator#7](https://github.com/iCalcreator/iCalcreator/issues/7) and [iCalcreator/iCalcreator#21](https://github.com/iCalcreator/iCalcreator/issues/21) for more information...
This project requires the packagist distribution from https://github.com/iCalcreator/iCalcreator in version 2.22.

### Step 2: Enable Bundle

Expand Down
65 changes: 33 additions & 32 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
{
"name": "dyvelop/icalcreator-bundle",
"type": "symfony-bundle",
"description": "Symfony bundle for creating iCal formatted files",
"license": "MIT",
"authors": [
{
"name": "Franziska Dyckhoff",
"email": "fdyckhoff@dyvelop.de"
"name": "dyvelop/icalcreator-bundle",
"type": "symfony-bundle",
"description": "Symfony bundle for creating iCal formatted files",
"license": "MIT",
"authors": [
{
"name": "Franziska Dyckhoff",
"email": "fdyckhoff@dyvelop.de"
}
],
"require": {
"php": ">=5.3.9",
"kigkonsult/icalcreator": "2.22.*",
"swiftmailer/swiftmailer": ">=4.2.0,~5.0",
"symfony/config": "~2.3|~3.1",
"symfony/dependency-injection": "~2.3|~3.1",
"symfony/http-foundation": "~2.3|~3.1",
"symfony/http-kernel": "~2.3|~3.1",
"symfony/yaml": "~2.3|~3.1"
},
"require-dev": {
"phpunit/phpunit": "~4.8|~5.7|~6.3",
"symfony/phpunit-bridge": "~2.7|~3.1"
},
"autoload": {
"psr-4": {
"Dyvelop\\ICalCreatorBundle\\": "src/"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
}
],
"require": {
"php": ">=5.3.9",
"kigkonsult/icalcreator": "*@dev",
"swiftmailer/swiftmailer": ">=4.2.0,~5.0",
"symfony/config": "~2.3|~3.1",
"symfony/dependency-injection": "~2.3|~3.1",
"symfony/http-foundation": "~2.3|~3.1",
"symfony/http-kernel": "~2.3|~3.1",
"symfony/yaml": "~2.3|~3.1"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.1"
},
"autoload": {
"psr-4": {
"Dyvelop\\ICalCreatorBundle\\": "src/"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
}
}
4 changes: 4 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@
</whitelist>
</filter>

<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>

</phpunit>
22 changes: 14 additions & 8 deletions src/Tests/bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
<?php

$file = __DIR__.'/../../vendor/autoload.php';
if (!file_exists($file)) {
throw new RuntimeException('Dependencies missing. Please install via composer before executing tests.');
}

$autoload = require_once $file;
<?php

$file = __DIR__.'/../../vendor/autoload.php';
if (!file_exists($file)) {
throw new RuntimeException('Dependencies missing. Please install via composer before executing tests.');
}

$autoload = require_once $file;

if (!class_exists('PHPUnit_Framework_TestCase')) {
class PHPUnit_Framework_TestCase extends \PHPUnit\Framework\TestCase
{
}
}

0 comments on commit eeca3e3

Please sign in to comment.