Removed submodules and replaced them with composer dependencies #86

Merged
merged 2 commits into from Dec 3, 2012

Projects

None yet

3 participants

@Spea

This PR is an updated version of the PR #6

@guilhermeblanco
Doctrine member

Everything seems ok to me.
@jwage and @stof you agree with the change?

@stof stof commented on an outdated diff Dec 2, 2012
tests/bootstrap.php
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+$loader = require_once __DIR__ . "/../vendor/autoload.php";
+$loader->add('Doctrine\\', __DIR__);
@stof
stof Dec 2, 2012

could you register Doctrine\Tests here ?

@stof stof commented on an outdated diff Dec 2, 2012
composer.json
@@ -9,7 +9,16 @@
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
],
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.3.2",
+ "doctrine/common": ">=2.2,<2.4-dev"
@stof
stof Dec 2, 2012

please change it to <2.5-dev to allow the 2.4.x serie (currently the master branch)

@Spea

Fixed

@stof stof merged commit 84cd1ca into doctrine:master Dec 3, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment