MDL-79678 libraries: Remove unused dependency Assert
This commit removes the dependency Assert that once was required by OTPHP, but is no longer needed as of version 11.2.0. Signed-off-by: Daniel Ziegenberg <[email protected]>
This commit is contained in:
@@ -25,9 +25,6 @@ require_once(__DIR__.'/../extlib/OTPHP/ParameterTrait.php');
|
||||
require_once(__DIR__.'/../extlib/OTPHP/OTP.php');
|
||||
require_once(__DIR__.'/../extlib/OTPHP/TOTP.php');
|
||||
|
||||
require_once(__DIR__.'/../extlib/Assert/Assertion.php');
|
||||
require_once(__DIR__.'/../extlib/Assert/AssertionFailedException.php');
|
||||
require_once(__DIR__.'/../extlib/Assert/InvalidArgumentException.php');
|
||||
require_once(__DIR__.'/../extlib/ParagonIE/ConstantTime/EncoderInterface.php');
|
||||
require_once(__DIR__.'/../extlib/ParagonIE/ConstantTime/Binary.php');
|
||||
require_once(__DIR__.'/../extlib/ParagonIE/ConstantTime/Base32.php');
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,35 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Assert
|
||||
*
|
||||
* LICENSE
|
||||
*
|
||||
* This source file is subject to the MIT license that is bundled
|
||||
* with this package in the file LICENSE.txt.
|
||||
* If you did not receive a copy of the license and are unable to
|
||||
* obtain it through the world-wide-web, please send an email
|
||||
* to [email protected] so I can send you a copy immediately.
|
||||
*/
|
||||
|
||||
namespace Assert;
|
||||
|
||||
use Throwable;
|
||||
|
||||
interface AssertionFailedException extends Throwable
|
||||
{
|
||||
/**
|
||||
* @return string|null
|
||||
*/
|
||||
public function getPropertyPath();
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function getValue();
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function getConstraints(): array;
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Assert
|
||||
*
|
||||
* LICENSE
|
||||
*
|
||||
* This source file is subject to the MIT license that is bundled
|
||||
* with this package in the file LICENSE.txt.
|
||||
* If you did not receive a copy of the license and are unable to
|
||||
* obtain it through the world-wide-web, please send an email
|
||||
* to [email protected] so I can send you a copy immediately.
|
||||
*/
|
||||
|
||||
namespace Assert;
|
||||
|
||||
class InvalidArgumentException extends \InvalidArgumentException implements AssertionFailedException
|
||||
{
|
||||
/**
|
||||
* @var string|null
|
||||
*/
|
||||
private $propertyPath;
|
||||
|
||||
/**
|
||||
* @var mixed
|
||||
*/
|
||||
private $value;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private $constraints;
|
||||
|
||||
public function __construct($message, $code, string $propertyPath = null, $value = null, array $constraints = [])
|
||||
{
|
||||
parent::__construct($message, $code);
|
||||
|
||||
$this->propertyPath = $propertyPath;
|
||||
$this->value = $value;
|
||||
$this->constraints = $constraints;
|
||||
}
|
||||
|
||||
/**
|
||||
* User controlled way to define a sub-property causing
|
||||
* the failure of a currently asserted objects.
|
||||
*
|
||||
* Useful to transport information about the nature of the error
|
||||
* back to higher layers.
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
public function getPropertyPath()
|
||||
{
|
||||
return $this->propertyPath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the value that caused the assertion to fail.
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function getValue()
|
||||
{
|
||||
return $this->value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the constraints that applied to the failed assertion.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getConstraints(): array
|
||||
{
|
||||
return $this->constraints;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
Copyright (c) 2011-2013, Benjamin Eberlei
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
- Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
- Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
@@ -1,23 +0,0 @@
|
||||
{
|
||||
"name": "beberlei/assert",
|
||||
"description": "Thin assertion library for input validation in business models.",
|
||||
"authors": [
|
||||
{"name": "Benjamin Eberlei", "email": "[email protected]"}
|
||||
],
|
||||
"license": "BSD-2-Clause",
|
||||
"keywords": ["assert", "assertion", "validation"],
|
||||
"require": {
|
||||
"ext-mbstring": "*"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Assert": "lib/"
|
||||
},
|
||||
"files": ["lib/Assert/functions.php"]
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.0.x-dev"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
Assert 2.1
|
||||
--------------
|
||||
https://github.com/beberlei/assert/releases/tag/v2.1
|
||||
|
||||
Instructions to import WebAuthn into Moodle:
|
||||
|
||||
1. Download the latest release from https://github.com/beberlei/assert/releases/tag/vx.x
|
||||
(choose "Source code")
|
||||
2. Unzip the source code
|
||||
3. Copy the following files from assert-x.x/lib/Assert into admin/tool/mfa/factor/totp/extlib/Assert:
|
||||
1. Assertion.php
|
||||
2. AssertionFailedException.php
|
||||
3. InvalidArgumentException.php
|
||||
|
||||
4. Copy the following files from assert-x.x into admin/tool/mfa/factor/totp/extlib/Assert:
|
||||
1. LICENSE
|
||||
2. composer.json
|
||||
@@ -24,9 +24,6 @@ require_once(__DIR__.'/../extlib/OTPHP/ParameterTrait.php');
|
||||
require_once(__DIR__.'/../extlib/OTPHP/OTP.php');
|
||||
require_once(__DIR__.'/../extlib/OTPHP/TOTP.php');
|
||||
|
||||
require_once(__DIR__.'/../extlib/Assert/Assertion.php');
|
||||
require_once(__DIR__.'/../extlib/Assert/AssertionFailedException.php');
|
||||
require_once(__DIR__.'/../extlib/Assert/InvalidArgumentException.php');
|
||||
require_once(__DIR__.'/../extlib/ParagonIE/ConstantTime/EncoderInterface.php');
|
||||
require_once(__DIR__.'/../extlib/ParagonIE/ConstantTime/Binary.php');
|
||||
require_once(__DIR__.'/../extlib/ParagonIE/ConstantTime/Base32.php');
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
<?xml version="1.0"?>
|
||||
<libraries>
|
||||
<library>
|
||||
<location>extlib/Assert</location>
|
||||
<name>Assert</name>
|
||||
<version>2.1</version>
|
||||
<license>MIT</license>
|
||||
<repository>https://github.com/beberlei/assert</repository>
|
||||
</library>
|
||||
<library>
|
||||
<location>extlib/OTPHP</location>
|
||||
<name>OTPHP</name>
|
||||
|
||||
Reference in New Issue
Block a user