Skip to content

Commit 3e492d6

Browse files
Merge branch '4.4' into 5.1
* 4.4: Update versions in composer.json [Mime] Fix serialization of RawMessage
2 parents 9f2a668 + 55396f9 commit 3e492d6

File tree

88 files changed

+101
-88
lines changed

Some content is hidden

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

88 files changed

+101
-88
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
@@ -209,7 +209,7 @@ install:
209209
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
210210
git rm -rq src/Symfony/Bridge/PhpUnit
211211
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
212-
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
212+
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
213213
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
214214
rm -rf .phpunit
215215
fi
@@ -243,7 +243,7 @@ install:
243243
git checkout -m FETCH_HEAD &&
244244
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
245245
else
246-
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
246+
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
247247
fi
248248
249249
- |

src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@
7676
]
7777
},
7878
"minimum-stability": "dev",
79-
"version": "5.1-dev"
79+
"version": "5.1.x-dev"
8080
}

src/Symfony/Bridge/Monolog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@
4545
]
4646
},
4747
"minimum-stability": "dev",
48-
"version": "5.1-dev"
48+
"version": "5.1.x-dev"
4949
}

src/Symfony/Bridge/PhpUnit/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
"url": "https://github.com/sebastianbergmann/phpunit"
4747
}
4848
},
49-
"version": "5.1-dev"
49+
"version": "5.1.x-dev"
5050
}

src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "5.1-dev"
36+
"version": "5.1.x-dev"
3737
}

src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@
7878
]
7979
},
8080
"minimum-stability": "dev",
81-
"version": "5.1-dev"
81+
"version": "5.1.x-dev"
8282
}

src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
]
4343
},
4444
"minimum-stability": "dev",
45-
"version": "5.1-dev"
45+
"version": "5.1.x-dev"
4646
}

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@
109109
]
110110
},
111111
"minimum-stability": "dev",
112-
"version": "5.1-dev"
112+
"version": "5.1.x-dev"
113113
}

src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@
6161
]
6262
},
6363
"minimum-stability": "dev",
64-
"version": "5.1-dev"
64+
"version": "5.1.x-dev"
6565
}

0 commit comments

Comments
 (0)