Skip to content

Commit

Permalink
Merge pull request robrichards#59 from Dashron/master
Browse files Browse the repository at this point in the history
Add robrichards to the namespace as the vendor
  • Loading branch information
robrichards committed Jul 16, 2015
2 parents b05ba0d + 92c4cb5 commit 445bb24
Show file tree
Hide file tree
Showing 27 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"homepage": "https://github.com/robrichards/xmlseclibs",
"autoload": {
"psr-4": {
"XMLSecLibs\\": "src"
"RobRichards\\XMLSecLibs\\": "src"
}
},
"require": {
Expand Down
10 changes: 5 additions & 5 deletions src/XMLSecEnc.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
namespace XMLSecLibs;
use \DomDocument;
use \DomNode;
use \DomXPath;
use \Exception;
namespace RobRichards\XMLSecLibs;
use DomDocument;
use DomNode;
use DomXPath;
use Exception;

/**
* xmlseclibs.php
Expand Down
12 changes: 6 additions & 6 deletions src/XMLSecurityDSig.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
namespace XMLSecLibs;
use \DomDocument;
use \DomXPath;
use \DomNode;
use \DomElement;
use \Exception;
namespace RobRichards\XMLSecLibs;
use DomDocument;
use DomXPath;
use DomNode;
use DomElement;
use Exception;

/**
* xmlseclibs.php
Expand Down
6 changes: 3 additions & 3 deletions src/XMLSecurityKey.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace XMLSecLibs;
use \DomElement;
use \Exception;
namespace RobRichards\XMLSecLibs;
use DomElement;
use Exception;

/**
* xmlseclibs.php
Expand Down
4 changes: 2 additions & 2 deletions tests/encrypteddata-node-order.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ the correct order.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecEnc;

$dom = new DOMDocument();
$dom->load(dirname(__FILE__) . '/basic-doc.xml');
Expand Down
2 changes: 1 addition & 1 deletion tests/extract-win-cert.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Extract Public Key
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');

use \XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityDSig;

$doc = new DOMDocument();
$arTests = array(
Expand Down
2 changes: 1 addition & 1 deletion tests/generatesessionkey-basics.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Basic tests for generateSessionKey().
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityKey;

$key = new XMLSecurityKey(XMLSecurityKey::TRIPLEDES_CBC);
$k = $key->generateSessionKey();
Expand Down
2 changes: 1 addition & 1 deletion tests/generatesessionkey-parity.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Check that generated triple-des keys have the correct parity.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityKey;

/* Run the test several times, to increase the chance of detecting an error. */
for ($t = 0; $t < 16; $t++) {
Expand Down
2 changes: 1 addition & 1 deletion tests/getcipherdata.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Test the getCipherData() function.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecEnc;

$doc = new DOMDocument();
$doc->load(dirname(__FILE__) . '/oaep_sha1-res.xml');
Expand Down
2 changes: 1 addition & 1 deletion tests/getsymmetrickeysize.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Test getSymmetricKeySize().
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityKey;

$keysizes = array(
XMLSecurityKey::TRIPLEDES_CBC => 24,
Expand Down
2 changes: 1 addition & 1 deletion tests/retrievalmethod-findkey.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Test for ds:RetrievalMethod.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecEnc;

$doc = new DOMDocument();
$doc->load(dirname(__FILE__) . "/retrievalmethod-findkey.xml");
Expand Down
4 changes: 2 additions & 2 deletions tests/sign-c14-comments.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Test signing with C14N with comments.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityKey;

if (file_exists(dirname(__FILE__) . '/sign-c14-comments.xml')) {
unlink(dirname(__FILE__) . '/sign-c14-comments.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/sign-empty-uri.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Signature Forcing Empty URI
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityKey;

if (file_exists(dirname(__FILE__) . '/sign-empty-uri.xml')) {
unlink(dirname(__FILE__) . '/sign-empty-uri.xml');
Expand Down
2 changes: 1 addition & 1 deletion tests/thumbprint.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Certificate thumbprint check
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityKey;

$siteKey = new XMLSecurityKey(XMLSecurityKey::RSA_OAEP_MGF1P, array('type'=>'public'));
$siteKey->loadKey(dirname(__FILE__) . '/mycert.pem', TRUE, TRUE);
Expand Down
2 changes: 1 addition & 1 deletion tests/withcomment-empty-uri.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Checks that comments are removed when using an empty URI in a Reference.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityDSig;

$doc = new DOMDocument();
$doc->load(dirname(__FILE__) . '/withcomment-empty-uri.xml');
Expand Down
2 changes: 1 addition & 1 deletion tests/withcomment-id-uri-object.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Checks that comments are removed when using an ID URI in a Reference.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityDSig;

$doc = new DOMDocument();
$doc->load(dirname(__FILE__) . '/withcomment-id-uri-object.xml');
Expand Down
2 changes: 1 addition & 1 deletion tests/withcomment-id-uri.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Checks that comments are removed when using an ID URI in a Reference.
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityDSig;

$doc = new DOMDocument();
$doc->load(dirname(__FILE__) . '/withcomment-id-uri.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/xml-sign-sha256-rsa-sha256.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Signature RSA SHA256
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityKey;

if (file_exists(dirname(__FILE__) . '/sign-sha256-rsa-sha256-test.xml')) {
unlink(dirname(__FILE__) . '/sign-sha256-rsa-sha256-test.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/xml-sign-subject.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Basic Signature With Subject
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityKey;

if (file_exists(dirname(__FILE__) . '/sign-subject.xml')) {
unlink(dirname(__FILE__) . '/sign-subject.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/xml-sign.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Basic Signature
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use \XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecurityKey;

if (file_exists(dirname(__FILE__) . '/sign-basic-test.xml')) {
unlink(dirname(__FILE__) . '/sign-basic-test.xml');
Expand Down
2 changes: 1 addition & 1 deletion tests/xmlsec-decrypt-content.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Basic Decryption: Content
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecEnc;

/* When we need to locate our own key based on something like a key name */
function locateLocalKey($objKey) {
Expand Down
2 changes: 1 addition & 1 deletion tests/xmlsec-decrypt.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Basic Decryption
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecEnc;

/* When we need to locate our own key based on something like a key name */
function locateLocalKey($objKey) {
Expand Down
4 changes: 2 additions & 2 deletions tests/xmlsec-encrypt-content.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Basic Encryption: Content
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecEnc;

if (file_exists(dirname(__FILE__) . '/oaep_sha1.xml')) {
unlink(dirname(__FILE__) . '/oaep_sha1.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/xmlsec-encrypt-noreplace.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Encryption without modifying original data
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecEnc;

$dom = new DOMDocument();
$dom->load(dirname(__FILE__) . '/basic-doc.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/xmlsec-encrypt.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Basic Encryption
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityKey;
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecurityKey;
use RobRichards\XMLSecLibs\XMLSecEnc;

if (file_exists(dirname(__FILE__) . '/oaep_sha1.xml')) {
unlink(dirname(__FILE__) . '/oaep_sha1.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/xmlsec-verify-rsa-sha256.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Verify RSA SHA256
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecEnc;

$doc = new DOMDocument();
$arTests = array('SIGN_TEST_RSA_SHA256'=>'sign-sha256-rsa-sha256-test.xml');
Expand Down
4 changes: 2 additions & 2 deletions tests/xmlsec-verify.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Basic Verify
--FILE--
<?php
require(dirname(__FILE__) . '/../xmlseclibs.php');
use \XMLSecLibs\XMLSecurityDSig;
use \XMLSecLibs\XMLSecEnc;
use RobRichards\XMLSecLibs\XMLSecurityDSig;
use RobRichards\XMLSecLibs\XMLSecEnc;

$doc = new DOMDocument();
$arTests = array('SIGN_TEST'=>'sign-basic-test.xml');
Expand Down

0 comments on commit 445bb24

Please sign in to comment.