Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 2e3557c

Browse files
authored
Merge pull request #716 from samuel4x4/master
Adding Symfony 4 support
2 parents 9563f1b + 1d4c9e4 commit 2e3557c

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ matrix:
1212
- php: 5.5
1313
- php: 5.6
1414
- php: 7.0
15+
- php: 7.1
16+
env: DEPENDENCIES=beta
1517
- php: hhvm
1618
allow_failures:
1719
- php: hhvm
@@ -21,6 +23,7 @@ env:
2123

2224
before_install:
2325
- composer self-update
26+
- if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
2427
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/framework-bundle=$SYMFONY_VERSION; fi
2528
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
2629
- if [[ ${TRAVIS_PHP_VERSION:0:2} == "5." ]]; then composer require --dev "phpunit/phpunit=4.8.*"; fi

Controller/DatatableController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DatatableController extends Controller
3939
*
4040
* @param Request $request
4141
*
42-
* @Route("/sg/datatables/edit/field", name="sg_datatables_edit")
42+
* @Route("/datatables/edit/field", name="sg_datatables_edit")
4343
* @Method("POST")
4444
*
4545
* @return Response

Resources/config/services.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ services:
1818

1919
sg_datatables.response:
2020
class: Sg\DatatablesBundle\Response\DatatableResponse
21+
public: true
2122
arguments:
2223
- '@request_stack'
2324

2425
sg_datatables.factory:
2526
class: Sg\DatatablesBundle\Datatable\DatatableFactory
27+
public: true
2628
arguments:
2729
- '@security.authorization_checker'
2830
- '@security.token_storage'

Resources/doc/installation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Load the routes of the bundle by adding this configuration to the app/config/rou
6969
sg_datatables_bundle:
7070
resource: "@SgDatatablesBundle/Controller/"
7171
type: annotation
72+
prefix: /sg
7273
```
7374
7475
### Step 4: Assetic Configuration

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
},
2020
"require": {
2121
"php": ">=5.5.9",
22-
"symfony/framework-bundle": "^3.0",
22+
"symfony/framework-bundle": "^3.0|^4.0",
2323
"doctrine/orm": "^2.5",
24-
"symfony/options-resolver": "^3.0",
25-
"symfony/property-access": "^3.0",
24+
"symfony/options-resolver": "^3.0|^4.0",
25+
"symfony/property-access": "^3.0|^4.0",
2626
"friendsofsymfony/jsrouting-bundle": "^1.6|^2.0"
2727
},
2828
"autoload": {

0 commit comments

Comments
 (0)