Skip to content

Commit 3ca2d80

Browse files
minor symfony#38439 Update versions in composer.json (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- Update versions in composer.json | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Should make the CI green. Commits ------- 8f714a2 Update versions in composer.json
2 parents f4a1885 + 8f714a2 commit 3ca2d80

File tree

55 files changed

+56
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+56
-59
lines changed

.github/build-packages.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
echo "Missing \"version\" in composer.json.\n";
5555
exit(1);
5656
}
57-
$package->version = str_replace('-dev', '.x-dev', $package->version);
5857
$package->dist['type'] = 'tar';
5958
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
6059

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ install:
228228
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
229229
git rm -rq src/Symfony/Bridge/PhpUnit
230230
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
231-
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
231+
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
232232
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
233233
rm -rf .phpunit
234234
fi
@@ -262,7 +262,7 @@ install:
262262
git checkout -m FETCH_HEAD &&
263263
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
264264
else
265-
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
265+
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
266266
fi
267267
268268
- |

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,5 @@
134134
"files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
135135
},
136136
"minimum-stability": "dev",
137-
"version": "3.4-dev"
137+
"version": "3.4.x-dev"
138138
}

src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@
5757
]
5858
},
5959
"minimum-stability": "dev",
60-
"version": "3.4-dev"
60+
"version": "3.4.x-dev"
6161
}

src/Symfony/Bridge/Monolog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@
4343
]
4444
},
4545
"minimum-stability": "dev",
46-
"version": "3.4-dev"
46+
"version": "3.4.x-dev"
4747
}

src/Symfony/Bridge/PhpUnit/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838
],
3939
"minimum-stability": "dev",
4040
"extra": {
41-
"branch-alias": {
42-
"dev-master": "3.4-dev"
43-
},
4441
"thanks": {
4542
"name": "phpunit/phpunit",
4643
"url": "https://github.com/sebastianbergmann/phpunit"
4744
}
48-
}
45+
},
46+
"version": "3.4.x-dev"
4947
}

src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
]
3131
},
3232
"minimum-stability": "dev",
33-
"version": "3.4-dev"
33+
"version": "3.4.x-dev"
3434
}

src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@
6767
]
6868
},
6969
"minimum-stability": "dev",
70-
"version": "3.4-dev"
70+
"version": "3.4.x-dev"
7171
}

src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
]
4242
},
4343
"minimum-stability": "dev",
44-
"version": "3.4-dev"
44+
"version": "3.4.x-dev"
4545
}

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@
9191
]
9292
},
9393
"minimum-stability": "dev",
94-
"version": "3.4-dev"
94+
"version": "3.4.x-dev"
9595
}

0 commit comments

Comments
 (0)