Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LemonLDAP NG
lemonldap-ng
Commits
0b52c97c
Commit
0b52c97c
authored
Dec 28, 2015
by
Yadd
Browse files
Use JSON::MaybeXS instead of JSON
JSON::Any used before as been deprecated
parent
db14f3c3
Changes
21
Hide whitespace changes
Inline
Side-by-side
debian/control
View file @
0b52c97c
...
...
@@ -20,7 +20,7 @@ Build-Depends-Indep: libapache-session-perl,
libglib-perl,
libhtml-template-perl,
libio-string-perl,
libjson-perl,
libjson-
maybexs-
perl,
liblasso-perl (>= 2.3.0),
libmime-lite-perl,
libmouse-perl,
...
...
@@ -158,6 +158,7 @@ Depends: ${misc:Depends},
libcrypt-rijndael-perl,
libdbi-perl,
libdigest-sha-perl,
libjson-maybexs-perl,
libmouse-perl,
libnet-cidr-lite-perl,
libsoap-lite-perl
...
...
@@ -189,7 +190,7 @@ Depends: ${misc:Depends},
libconvert-pem-perl,
libcrypt-openssl-rsa-perl,
libhtml-template-perl,
libjson-perl,
libjson-
maybexs-
perl,
liblemonldap-ng-common-perl (= ${binary:Version}),
liblemonldap-ng-handler-perl (= ${binary:Version}),
libplack-perl,
...
...
lemonldap-ng-common/Makefile.PL
View file @
0b52c97c
...
...
@@ -34,6 +34,7 @@ WriteMakefile(
'
Apache::Session::Browseable
'
=>
0
,
'
HTML::Template
'
=>
0
,
'
HTTP::Message
'
=>
0
,
'
JSON::MaybeXS
'
=>
0
,
'
Net::LDAP
'
=>
0
,
'
XML::Simple
'
=>
0
,
'
XML::LibXML
'
=>
0
,
...
...
lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/Serialize/JSON.pm
View file @
0b52c97c
...
...
@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::Apache::Session::Serialize::JSON;
use
strict
;
use
vars
qw($VERSION)
;
use
JSON
;
use
JSON
::
MaybeXS
;
our
$VERSION
=
'
1.9.0
';
...
...
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/File.pm
View file @
0b52c97c
...
...
@@ -2,6 +2,7 @@ package Lemonldap::NG::Common::Conf::File;
use
strict
;
use
Lemonldap::NG::Common::Conf::
Constants
;
#inherits
use
JSON::
MaybeXS
;
our
$VERSION
=
'
1.4.0
';
our
$initDone
;
...
...
@@ -18,14 +19,6 @@ sub Lemonldap::NG::Common::Conf::_file {
sub
prereq
{
my
$self
=
shift
;
unless
(
$initDone
)
{
eval
"
use JSON
";
if
(
$@
)
{
$
Lemonldap::NG::Common::Conf::
msg
.=
"
Unable to load JSON: $@
\n
";
return
0
;
}
$initDone
++
;
}
unless
(
$self
->
{
dirName
}
)
{
$
Lemonldap::NG::Common::Conf::
msg
.=
'
"dirName" is required in "File" configuration type ! \n
';
...
...
lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm
View file @
0b52c97c
...
...
@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::PSGI;
use
5.10.0
;
use
Mouse
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
Lemonldap::NG::Common::PSGI::
Constants
;
use
Lemonldap::NG::Common::PSGI::
Request
;
...
...
lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm
View file @
0b52c97c
...
...
@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::PSGI::Request;
use
strict
;
use
Mouse
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
URI::
Escape
;
our
$VERSION
=
'
1.9.0
';
...
...
lemonldap-ng-manager/Makefile.PL
View file @
0b52c97c
...
...
@@ -16,7 +16,7 @@ WriteMakefile(
'Convert::PEM'
=>
0,
'Crypt::OpenSSL::RSA'
=>
0,
'HTML::Template'
=>
0,
'JSON
'
=>
0,
'JSON
::MaybeXS'
=>
0,
'Lemonldap::NG::Common'
=>
'1.9.0'
,
'Lemonldap::NG::Handler'
=>
'1.9.0'
,
'LWP'
=>
0,
...
...
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
View file @
0b52c97c
...
...
@@ -7,7 +7,7 @@ use Lemonldap::NG::Manager::Build::Tree;
use
Lemonldap::NG::Manager::Build::
CTrees
;
use
Data::
Dumper
;
use
Regexp::
Assemble
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
Getopt::
Std
;
use
IO::
String
;
...
...
lemonldap-ng-manager/t/02-HTML-template.t
View file @
0b52c97c
#!/usr/bin/env perl -I pl/lib
use
Test::
More
;
use
JSON
;
use
strict
;
use
5.10.0
;
...
...
lemonldap-ng-manager/t/05-rest-api.t
View file @
0b52c97c
#!/usr/bin/env perl -I pl/lib
use
Test::
More
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
strict
;
use
5.10.0
;
...
...
lemonldap-ng-manager/t/06-rest-api.t
View file @
0b52c97c
...
...
@@ -3,7 +3,7 @@
use
Test::
More
;
use
5.10.0
;
use
strict
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
IO::
String
;
require
'
t/test-lib.pm
';
...
...
lemonldap-ng-manager/t/10-save-unchanged-conf.t
View file @
0b52c97c
...
...
@@ -3,7 +3,7 @@
use
Test::
More
;
use
5.10.0
;
use
strict
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
Data::
Dumper
;
require
'
t/test-lib.pm
';
...
...
lemonldap-ng-manager/t/12-save-changed-conf.t
View file @
0b52c97c
...
...
@@ -3,7 +3,7 @@
use
Test::
More
;
use
5.10.0
;
use
strict
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
Data::
Dumper
;
require
'
t/test-lib.pm
';
...
...
lemonldap-ng-manager/t/40-sessions.t
View file @
0b52c97c
#!/usr/bin/env perl -I pl/lib
use
Test::
More
;
use
JSON::
MaybeXS
;
use
strict
;
use
5.10.0
;
use
Lemonldap::NG::Common::
Session
;
...
...
@@ -145,7 +146,7 @@ foreach (@ids) {
my
$res
;
ok
(
$res
=
del
("
/sessions/global/
$_
"),
"
Delete
$_
"
);
ok
(
$res
->
[
0
]
==
200
,
'
Result code is 200
'
);
ok
(
JSON::
decode_json
(
$res
->
[
2
]
->
[
0
]
)
->
{
result
}
==
1
,
ok
(
decode_json
(
$res
->
[
2
]
->
[
0
]
)
->
{
result
}
==
1
,
'
Body is JSON and result==1
'
);
count
(
3
);
}
...
...
lemonldap-ng-manager/t/90-translations.t
View file @
0b52c97c
#!/usr/bin/env perl -I pl/lib
use
Test::
More
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
strict
;
use
5.10.0
;
...
...
lemonldap-ng-manager/t/test-lib.pm
View file @
0b52c97c
# Common tests lib
use
JSON
;
use
JSON
::
MaybeXS
;
use
5.10.0
;
use
Data::
Dumper
;
...
...
lemonldap-ng-portal/Makefile.PL
View file @
0b52c97c
...
...
@@ -13,6 +13,7 @@ WriteMakefile(
'DBI'
=>
0,
'Glib'
=>
0,
'HTTP::Message'
=>
0,
'JSON::MaybeXS'
=>
0,
'Lasso'
=>
'2.3.0'
,
'Lemonldap::NG::Handler'
=>
'1.9.0'
,
'LWP'
=>
0,
...
...
lemonldap-ng-portal/example/oauth2.pl
View file @
0b52c97c
...
...
@@ -3,7 +3,7 @@
# Simple OpenID Connect client
use
strict
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
LWP::
UserAgent
;
use
MIME::
Base64
qw/encode_base64url encode_base64 decode_base64url decode_base64/
;
...
...
lemonldap-ng-portal/example/openid-configuration.pl
View file @
0b52c97c
#!/usr/bin/perl
use
Lemonldap::NG::Portal::
SharedConf
;
use
JSON
;
use
JSON
::
MaybeXS
;
use
strict
;
my
$portal
=
Lemonldap::NG::Portal::
SharedConf
->
new
();
...
...
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthBrowserID.pm
View file @
0b52c97c
...
...
@@ -9,7 +9,7 @@ use strict;
use
Lemonldap::NG::Portal::
Simple
;
use
Lemonldap::NG::Portal::
_Browser
;
use
HTTP::
Request
;
use
JSON
;
use
JSON
::
MaybeXS
;
our
@ISA
=
(
qw(Lemonldap::NG::Portal::_Browser)
);
our
$VERSION
=
'
1.3.0
';
...
...
@@ -96,7 +96,7 @@ sub extractFormInfo {
"
Received BrowserID answer:
"
.
$self
->
{
browserIdAnswerRaw
},
'
debug
'
);
my
$json
=
new
JSON
();
my
$json
=
JSON
->
new
();
$self
->
{
browserIdAnswer
}
=
$json
->
decode
(
$self
->
{
browserIdAnswerRaw
}
);
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment