Merge pull request #1 from mbabker/encrypt-lib

Shuffle around the php-encryption library setup
joomla · Nov 12, 2015 · 78619fb · 78619fb
2 parents 2972195 + cedeaa0
commit 78619fb
Show file tree

Hide file tree

Showing 11 changed files with 680 additions and 913 deletions.
diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml
@@ -14,6 +14,7 @@
  <exclude-pattern type="relative">libraries/compat/password/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/fof/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/idna_convert/*</exclude-pattern>
+ <exclude-pattern type="relative">libraries/php-encryption/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/phputf8/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/simplepie/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/phpass/*</exclude-pattern>

diff --git a/libraries/cms.php b/libraries/cms.php
@@ -64,6 +64,9 @@
 // Register JArrayHelper due to JRegistry moved to composer's vendor folder
 JLoader::register('JArrayHelper', JPATH_PLATFORM . '/joomla/utilities/arrayhelper.php');
 
+// Register the Crypto lib
+JLoader::register('Crypto', JPATH_PLATFORM . '/php-encryption/Crypto.php');
+
 // Register classes where the names have been changed to fit the autoloader rules
 // @deprecated  4.0
 JLoader::register('JToolBar', JPATH_PLATFORM . '/cms/toolbar/toolbar.php');

diff --git a/libraries/defuse/php-encryption/.travis.yml b/libraries/defuse/php-encryption/.travis.yml