Guard against duplicate class errors.

paragonie · Apr 21, 2017 · fc1f09e · fc1f09e
1 parent b87e1e0
commit fc1f09e
Show file tree

Hide file tree

Showing 26 changed files with 1,835 additions and 1,733 deletions.
diff --git a/src/Compat.php b/src/Compat.php
diff --git a/src/Core/BLAKE2b.php b/src/Core/BLAKE2b.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_BLAKE2b
  *

diff --git a/src/Core/ChaCha20.php b/src/Core/ChaCha20.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_ChaCha20
  */

diff --git a/src/Core/ChaCha20/Ctx.php b/src/Core/ChaCha20/Ctx.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_ChaCha20_Ctx
  */

diff --git a/src/Core/ChaCha20/IetfCtx.php b/src/Core/ChaCha20/IetfCtx.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_ChaCha20_IetfCtx
  */

diff --git a/src/Core/Curve25519.php b/src/Core/Curve25519.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Curve25519
  *

diff --git a/src/Core/Curve25519/Fe.php b/src/Core/Curve25519/Fe.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Fe
  *

diff --git a/src/Core/Curve25519/Ge/Cached.php b/src/Core/Curve25519/Ge/Cached.php
@@ -1,5 +1,9 @@
 <?php
 
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Cached', false)) {
+ return;
+}
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
  */

diff --git a/src/Core/Curve25519/Ge/P1p1.php b/src/Core/Curve25519/Ge/P1p1.php
@@ -1,5 +1,8 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P1p1', false)) {
+ return;
+}
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
  */

diff --git a/src/Core/Curve25519/Ge/P2.php b/src/Core/Curve25519/Ge/P2.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P2', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_P2
  */

diff --git a/src/Core/Curve25519/Ge/P3.php b/src/Core/Curve25519/Ge/P3.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P3', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_P3
  */

diff --git a/src/Core/Curve25519/Ge/Precomp.php b/src/Core/Curve25519/Ge/Precomp.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Precomp', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
  */

diff --git a/src/Core/Curve25519/H.php b/src/Core/Curve25519/H.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_H', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_H
  *

diff --git a/src/Core/Ed25519.php b/src/Core/Ed25519.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Ed25519', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Ed25519
  */

diff --git a/src/Core/HChaCha20.php b/src/Core/HChaCha20.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_HChaCha20', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_HChaCha20
  */

diff --git a/src/Core/HSalsa20.php b/src/Core/HSalsa20.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_HSalsa20', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_HSalsa20
  */

diff --git a/src/Core/Poly1305.php b/src/Core/Poly1305.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Poly1305', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Poly1305
  */

diff --git a/src/Core/Poly1305/State.php b/src/Core/Poly1305/State.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Poly1305_State
  */

diff --git a/src/Core/Salsa20.php b/src/Core/Salsa20.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Salsa20', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Salsa20
  */

diff --git a/src/Core/SipHash.php b/src/Core/SipHash.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_SipHash', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_SodiumCompat_Core_SipHash
  *

diff --git a/src/Core/Util.php b/src/Core/Util.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_Util', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Util
  */

diff --git a/src/Core/X25519.php b/src/Core/X25519.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_X25519', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_X25519
  */

diff --git a/src/Core/XChaCha20.php b/src/Core/XChaCha20.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Core_XChaCha20', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_XChaCha20
  */

diff --git a/src/Core/Xsalsa20.php b/src/Core/Xsalsa20.php
@@ -1,5 +1,10 @@
 <?php
 
+
+if (class_exists('ParagonIE_Sodium_Core_Xsalsa20', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Core_Xsalsa20
  */

diff --git a/src/Crypto.php b/src/Crypto.php
@@ -1,5 +1,9 @@
 <?php
 
+if (class_exists('ParagonIE_Sodium_Crypto', false)) {
+ return;
+}
+
 /**
  * Class ParagonIE_Sodium_Crypto
  *

diff --git a/src/File.php b/src/File.php
@@ -1,5 +1,9 @@
 <?php
 
+
+if (class_exists('ParagonIE_Sodium_File', false)) {
+ return;
+}
 /**
  * Class ParagonIE_Sodium_File
  */