Skip to content

Commit

Permalink
Merge pull request #712 from jim-parry/remove/encryption
Browse files Browse the repository at this point in the history
Remove/encryption
  • Loading branch information
jim-parry authored Sep 8, 2017
2 parents f71b0e0 + b0692c2 commit 61cf692
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 1,496 deletions.
69 changes: 0 additions & 69 deletions application/Config/Encryption.php

This file was deleted.

24 changes: 0 additions & 24 deletions system/Config/Services.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,30 +178,6 @@ public static function curlrequest(array $options = [], $response = null, \Confi

//--------------------------------------------------------------------

/**
* The Encryption class provides two-way encryption.
*
* @param mixed $config
* @param bool $getShared
*
* @return \CodeIgniter\Encryption\EncrypterInterface Encryption handler
*/
public static function encrypter($config = null, $getShared = false)
{
if ($getShared === true)
return self::getSharedInstance('encrypter', $config);

$config = $config ?? new \Config\Encryption();
if ($config != null && is_object($config))
$config = (array) $config;

$encryption = new \CodeIgniter\Encryption\Encryption($config);
$encrypter = $encryption->initialize($config);
return $encrypter;
}

//--------------------------------------------------------------------

/**
* The Exceptions class holds the methods that handle:
*
Expand Down
63 changes: 0 additions & 63 deletions system/Encryption/EncrypterInterface.php

This file was deleted.

Loading

0 comments on commit 61cf692

Please sign in to comment.