Skip to content

Commit

Permalink
Merge pull request #15 from hshn/catching-up
Browse files Browse the repository at this point in the history
Updated outdated stuffs
  • Loading branch information
hshn authored Oct 3, 2019
2 parents 1192a01 + a34c873 commit b5e5811
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 59 deletions.
25 changes: 11 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
language: php

node_js:
- 0.12
cache:
directories:
- .phpunit
- $HOME/.composer/cache/files

php:
- 7.0
- 7.1
- 7.2
- 7.3

matrix:
fast_finish: true
include:
- php: 7.2
env: SYMFONY_VERSION=2.8.*
- php: 7.2
env: SYMFONY_VERSION=3.3.*
- php: 7.2
env: SYMFONY_VERSION=3.4.*
- php: 7.2
env: SYMFONY_VERSION=4.0.*
- php: 7.1
env: DEPENDENCY="symfony/lts:^2"
- php: 7.1
env: DEPENDENCY="symfony/lts:^3"

before_install:
- composer selfupdate
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
- if [ "$DEPENDENCY" != "" ]; then composer require "${DEPENDENCY}" --dev --no-update; fi;

install:
- npm install
- composer update --prefer-source --no-interaction

script: npm test
script: composer run-script test
7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"authors": [
{
"name": "Shota Hoshino",
"email": "lga0503@gmail.com"
"email": "sht.hshn@gmail.com"
}
],
"require": {
"php": "^7.0",
"php": "^7.1.0",
"symfony/http-foundation": "^2.8 || ^3.0 || ^4.0"
},
"require-dev": {
Expand All @@ -27,6 +27,9 @@
"symfony/http-kernel": "to use the bundle in a Symfony project",
"symfony/config": "to use the bundle in a Symfony project"
},
"scripts": {
"test": "vendor/bin/phpunit -c ."
},
"autoload": {
"psr-4": {
"Hshn\\Base64EncodedFile\\": "src"
Expand Down
19 changes: 0 additions & 19 deletions gulpfile.js

This file was deleted.

10 changes: 0 additions & 10 deletions package.json

This file was deleted.

13 changes: 0 additions & 13 deletions src/Form/Type/Base64EncodedFileType.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;


/**
* @author Shota Hoshino <[email protected]>
Expand Down Expand Up @@ -61,17 +59,6 @@ public function getBlockPrefix()
return 'file_base64_encoded';
}

/**
* BC for SF < 2.7
*
* @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
*/
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
/* @var $resolver OptionsResolver */
$this->configureOptions($resolver);
}

/**
* BC for SF < 3.0
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function testReverseTransform(Constraint $expectedConstraint, $value)
}

/**
* @test
* @return array
*/
public function provideReverseTransformEmptyTests()
{
Expand Down

0 comments on commit b5e5811

Please sign in to comment.