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

Commit

Permalink
Merge pull request #2 from Cethy/fix_for_symfony4
Browse files Browse the repository at this point in the history
bump composer configuration for symfony > 3.4
  • Loading branch information
Cethy authored Feb 4, 2019
2 parents 48096d5 + aa4f153 commit c403f84
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 28 deletions.
20 changes: 20 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2
jobs:
build:
#environment:
# CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
# CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
docker:
- image: circleci/php:7.1
working_directory: ~/Cethy/GooglePlaceAutocompleteBundle
steps:
- checkout
#- run: pecl install xdebug
#- run: echo "date.timezone = \"Europe/Paris\"" > /opt/circleci/php/$(phpenv global)/etc/conf.d/date.ini
- run: composer install --no-interaction
# Test
- run: vendor/bin/phpunit -c phpunit.xml.dist --coverage-html "/tmp/circleci-test-results"
# Save test results
- store_artifacts:
path: /tmp/circleci-test-results

8 changes: 8 additions & 0 deletions .circleci/local.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#/bin/sh
export CIRCLE_TOKEN=f241ae4c90ad683d5d450e3a1a397d4aa63a21fd

curl --user ${CIRCLE_TOKEN}: \
--request POST \
--form config=@config.yml \
--form notify=false \
https://circleci.com/api/v1.1/project/github/Cethy/GooglePlaceAutocompleteBundle/tree/fix_for_symfony4
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ Provides a Google Place Autocomplete Type, the most minimalist, unobtrusive way

[![CircleCI](https://circleci.com/gh/Cethy/GooglePlaceAutocompleteBundle/tree/master.svg?style=shield)](https://circleci.com/gh/Cethy/GooglePlaceAutocompleteBundle/tree/master)

## Versions
### For symfony >= 3.4
Use latest or >= v3.0

### For symfony < 3.4
Use 2.2 or lower


## Install

Expand Down
12 changes: 0 additions & 12 deletions circle.yml

This file was deleted.

26 changes: 13 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
"description": "Provides a Google Place Autocomplete Type, the most minimalist, unobtrusive way possible.",
"type": "symfony-bundle",
"require": {
"php": ">=5.6.17",
"php": "^7.1.3",
"cethyworks/content-injector-bundle": "^2.0",
"symfony/dependency-injection": "^3.3",
"symfony/config": "^3.3",
"symfony/dependency-injection": "^3.4",
"symfony/config": "^3.4",
"twig/twig": "^1.0||^2.0",
"symfony/form": "^3.3"
"symfony/form": "^3.4"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
"symfony/http-foundation": "^3.3",
"symfony/event-dispatcher": "^3.3",
"symfony/http-kernel": "^3.3",
"symfony/framework-bundle": "~2.7|~3.0|~4.0",
"symfony/twig-bundle": "^3.3",
"symfony/translation": "^3.3",
"symfony/validator": "^3.3",
"symfony/asset": "^3.3",
"symfony/templating": "^3.3"
"symfony/http-foundation": "^3.4",
"symfony/event-dispatcher": "^3.4",
"symfony/http-kernel": "^3.4",
"symfony/framework-bundle": "^3.4|~4.0",
"symfony/twig-bundle": "^3.4",
"symfony/translation": "^3.4",
"symfony/validator": "^3.4",
"symfony/asset": "^3.4",
"symfony/templating": "^3.4"
},
"authors": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Cethyworks\GooglePlaceAutocompleteBundle\Form\Extension\GooglePlaceAutocompleteInjectorAwareTypeExtension;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Form;
use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\OptionsResolver;

Expand Down Expand Up @@ -86,7 +86,7 @@ public function dataTestBuildViewShouldNotRegisterCommand()
public function testBuildViewShouldNotRegisterCommand($options)
{
$view = new FormView();
$form = $this->getMockBuilder(FormInterface::class)->disableOriginalConstructor()->getMock();
$form = $this->getMockBuilder(Form::class)->disableOriginalConstructor()->getMock();

$this->subscriber->expects($this->never())->method('registerCommand');

Expand All @@ -98,7 +98,7 @@ public function testBuildViewShouldRegisterCommand()
$options = ['injector' => true, 'injector_google_place_autocomplete' => true, ];

$view = new FormView();
$form = $this->getMockBuilder(FormInterface::class)->disableOriginalConstructor()->getMock();
$form = $this->getMockBuilder(Form::class)->disableOriginalConstructor()->getMock();

$this->subscriber->expects($this->once())->method('registerCommand')->with($this->libraryCommand);

Expand Down

0 comments on commit c403f84

Please sign in to comment.