Skip to content

Commit bf6f7b1

Browse files
committed
Removing the Symfony ClassLoader in favor of Composer - closes #9
1 parent d53d713 commit bf6f7b1

File tree

7 files changed

+17
-25
lines changed

7 files changed

+17
-25
lines changed

.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
/composer.lock
2-
/vendor/*
3-
!/vendor/symfony
2+
/vendor

.gitmodules

-3
This file was deleted.

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ php:
44
- 5.3
55
- 5.4
66

7-
before_script: git submodule update --init
7+
before_script:
8+
- wget --quiet http://getcomposer.org/composer.phar
9+
- php composer.phar install --install-suggests

README.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ See [json-schema](http://json-schema.org/) for more details.
1212

1313
### Dependencies
1414

15-
#### via `submodules` (*will use the Symfony ClassLoader Component*)
16-
17-
$ git submodule update --init
18-
19-
#### via [`composer`](https://github.com/composer/composer) (*will use the Composer ClassLoader*)
15+
#### [`Composer`](https://github.com/composer/composer) (*will use the Composer ClassLoader*)
2016

2117
$ wget http://getcomposer.org/composer.phar
2218
$ php composer.phar install

src/JsonSchema/Constraints/Constraint.php

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ protected function checkArray($value, $schema = null, $path = null, $i = null)
108108
* @param mixed $schema
109109
* @param mixed $path
110110
* @param mixed $i
111+
* @param mixed $patternProperties
111112
*/
112113
protected function checkObject($value, $schema = null, $path = null, $i = null, $patternProperties = null)
113114
{

tests/bootstrap.php

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?php
22

3-
if (is_readable(__DIR__.'/../vendor/.composer/autoload.php')) {
4-
//composer
5-
$loader = require_once(__DIR__.'/../vendor/.composer/autoload.php');
6-
$loader->add('JsonSchema\Tests', __DIR__);
7-
$loader->register();
3+
if (!is_readable(__DIR__.'/../vendor/autoload.php')) {
4+
echo <<<EOT
5+
You must run `composer.phar install` to install the dependencies
6+
before running the test suite.
87
9-
} elseif (is_readable(__DIR__.'/../vendor/symfony/Component/ClassLoader/UniversalClassLoader.php')) {
10-
//submodule
11-
require_once __DIR__.'/../vendor/symfony/Component/ClassLoader/UniversalClassLoader.php';
8+
EOT;
9+
exit(1);
10+
}
1211

13-
$loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
14-
$loader->registerNamespace('JsonSchema', __DIR__.'/../src');
15-
$loader->registerNamespace('JsonSchema\Tests', __DIR__);
16-
$loader->register();
17-
}
12+
//composer
13+
$loader = require_once(__DIR__.'/../vendor/autoload.php');
14+
$loader->add('JsonSchema\Tests', __DIR__);
15+
$loader->register();

vendor/symfony/Component/ClassLoader

-1
This file was deleted.

0 commit comments

Comments
 (0)