Rename lib & classes

README.md

@@ -1,18 +1,18 @@
-CallbackValidator
-=================
+JsonpCallbackValidator
+======================
 
-**CallbackValidator** allows you to **validate a JSONP callback** in order to
-prevent XSS attacks.
+**JsonpCallbackValidator** allows you to **validate a JSONP callback** in order
+to prevent XSS attacks.
 
 [![Build
-Status](https://travis-ci.org/willdurand/CallbackValidator.png?branch=master)](https://travis-ci.org/willdurand/CallbackValidator)
+Status](https://travis-ci.org/willdurand/JsonpCallbackValidator.png?branch=master)](https://travis-ci.org/willdurand/JsonpCallbackValidator)
 
 
 Usage
 -----
 
 ```php
-$validator = new \CallbackValidator\CallbackValidator();
+$validator = new \JsonpCallbackValidator();
 
 $validator->validate('JSONP.callback');
 // returns `true`
@@ -25,19 +25,19 @@ $validator->validate('(function xss(x){evil()})');
 Installation
 ------------
 
-The recommended way to install CallbackValidator is through
+The recommended way to install JsonpCallbackValidator is through
 [Composer](http://getcomposer.org/):
 
 ``` json
 {
     "require": {
-        "willdurand/callback-validator": "@stable"
+        "willdurand/jsonp-callback-validator": "@stable"
     }
 }
 ```
 
 **Protip:** you should browse the
-[`willdurand/callback-validator`](https://packagist.org/packages/willdurand/callback-validator)
+[`willdurand/jsonp-callback-validator`](https://packagist.org/packages/willdurand/jsonp-callback-validator)
 page to choose a stable version to use, avoid the `@stable` meta constraint.
 
 
@@ -69,5 +69,5 @@ Credits
 License
 -------
 
-CallbackValidator is released under the MIT License. See the bundled LICENSE
-file for details.
+JsonpCallbackValidator is released under the MIT License. See the bundled
+LICENSE file for details.

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "willdurand/callback-validator",
+    "name": "willdurand/jsonp-callback-validator",
     "description": "JSONP callback validator.",
     "type": "library",
     "license": "MIT",
@@ -16,7 +16,7 @@
         "phpunit/phpunit": "~3.7"
     },
     "autoload": {
-        "psr-0": { "CallbackValidator": "src/" }
+        "psr-0": { "JsonpCallbackValidator": "src/" }
     },
     "config": {
         "bin-dir": "bin"

src/CallbackValidator/CallbackValidator.php → src/JsonpCallbackValidator.php

@@ -1,14 +1,12 @@
 <?php
 
-namespace CallbackValidator;
-
 /**
  * Most of the code above took inspiration from:
  * https://gist.github.com/ptz0n/1217080.
  *
  * @author William Durand <[email protected]>
  */
-class CallbackValidator
+class JsonpCallbackValidator
 {
     private $reservedKeywords = array(
         'break',

tests/CallbackValidator/Tests/CallbackValidatorTest.php → tests/JsonpCallbackValidatorTest.php

@@ -1,10 +1,6 @@
 <?php
 
-namespace CallbackValidator\Tests;
-
-use CallbackValidator\CallbackValidator;
-
-class CallbackValidatorTest extends TestCase
+class JsonpCallbackValidatorTest extends \PHPUnit_Framework_TestCase
 {
     const IS_VALID   = true;
 
@@ -15,7 +11,7 @@ class CallbackValidatorTest extends TestCase
      */
     public function testValidate($callback, $expected)
     {
-        $validator = new CallbackValidator();
+        $validator = new \JsonpCallbackValidator();
         $this->assertEquals($expected, $validator->validate($callback));
     }
 

tests/bootstrap.php

@@ -11,5 +11,3 @@
 EOT
     );
 }
-
-$loader->add('CallbackValidator\Tests', __DIR__);