Skip to content

Commit ccbf620

Browse files
tvdijentvdijen
committed
Move src/ to resources/
1 parent 082ed85 commit ccbf620

122 files changed

Lines changed: 39 additions & 39 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.php_cs.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$finder = PhpCsFixer\Finder::create()
44
->exclude(__DIR__ . '/www/resources')
55
->in([
6-
__DIR__ . '/lib',
76
__DIR__ . '/modules',
7+
__DIR__ . '/src',
88
__DIR__ . '/templates',
99
__DIR__ . '/tests',
1010
__DIR__ . '/www',

‎TESTING.md‎

Lines changed: 2 additions & 2 deletions

‎bin/get-translatable-strings‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* - The main product and the standard modules, when invoked with '--main'.
1111
*
1212
* It will search all Twig templates for occurences of the trans()
13-
* function, and all PHP code under lib/ for the noop() function.
13+
* function, and all PHP code under src/ for the noop() function.
1414
*/
1515
declare(strict_types=1);
1616

@@ -22,7 +22,7 @@ use Symfony\Component\Filesystem\Filesystem;
2222
$baseDir = dirname(dirname(__FILE__));
2323

2424
// Add library autoloader
25-
require_once($baseDir . '/lib/_autoload.php');
25+
require_once($baseDir . '/src/_autoload.php');
2626

2727
if($argc != 2) {
2828
echo "Usage: $argv[0] (<module>|--main)\n";
@@ -52,9 +52,9 @@ foreach($modules as $module) {
5252
$domain = $module ?: 'messages';
5353

5454
$moduleDir = $baseDir . ($module === '' ? '' : '/modules/' . $module);
55-
$moduleLibDir = $moduleDir . '/lib/';
55+
$moduleSrcDir = $moduleDir . '/src/';
5656
$outputDir = $moduleDir . $outputSuffix;
57-
print `find $tempDir $moduleLibDir -name \*.php | xargs xgettext --default-domain=$domain -p $outputDir --from-code=UTF-8 -j --omit-header --no-location -ktrans -knoop -L PHP`;
57+
print `find $tempDir $moduleSrcDir -name \*.php | xargs xgettext --default-domain=$domain -p $outputDir --from-code=UTF-8 -j --omit-header --no-location -ktrans -knoop -L PHP`;
5858
}
5959

6060
$filesystem->remove($tempDirBase);

‎bin/importPdoMetadata.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
$baseDir = dirname(dirname(__FILE__));
55

6-
require_once $baseDir . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . '_autoload.php';
6+
require_once $baseDir . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . '_autoload.php';
77
require_once \SimpleSAML\Utils\Config::getConfigDir() . DIRECTORY_SEPARATOR . 'config.php';
88

99
# Iterate through configured metadata sources and ensure

‎bin/initMDSPdo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
$baseDir = dirname(dirname(__FILE__));
66

77
// Add library autoloader and configuration
8-
require_once $baseDir . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . '_autoload.php';
8+
require_once $baseDir . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . '_autoload.php';
99
require_once \SimpleSAML\Utils\Config::getConfigDir() . DIRECTORY_SEPARATOR . 'config.php';
1010

1111
echo "Initializing Metadata Database..." . PHP_EOL;

‎bin/memcacheSync.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
$baseDir = dirname(dirname(__FILE__));
2222

2323
// Add library autoloader
24-
require_once($baseDir . '/lib/_autoload.php');
24+
require_once($baseDir . '/src/_autoload.php');
2525

2626
// Initialize the configuration
2727
$configdir = SimpleSAML\Utils\Config::getConfigDir();

‎bin/pwgen.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$baseDir = dirname(dirname(__FILE__));
1111

1212
// Add library autoloader
13-
require_once($baseDir . '/lib/_autoload.php');
13+
require_once($baseDir . '/src/_autoload.php');
1414

1515

1616
echo "Enter password: ";

‎composer.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
],
2222
"autoload": {
2323
"psr-4": {
24-
"SimpleSAML\\": "lib/SimpleSAML",
24+
"SimpleSAML\\": "src/SimpleSAML",
2525
"SimpleSAML\\Module\\admin\\": "modules/admin/lib",
2626
"SimpleSAML\\Module\\core\\": "modules/core/lib",
2727
"SimpleSAML\\Module\\cron\\": "modules/cron/lib",
@@ -32,13 +32,13 @@
3232
},
3333
"autoload-dev": {
3434
"psr-4": {
35-
"SimpleSAML\\Test\\": ["tests", "tests/lib/SimpleSAML"],
36-
"SimpleSAML\\Test\\Module\\admin\\": ["tests/lib/SimpleSAML/modules/admin/lib"],
37-
"SimpleSAML\\Test\\Module\\core\\": ["tests/lib/SimpleSAML/modules/core/lib"],
38-
"SimpleSAML\\Test\\Module\\cron\\": ["tests/lib/SimpleSAML/modules/cron/lib"],
39-
"SimpleSAML\\Test\\Module\\exampleauth\\": ["tests/lib/SimpleSAML/modules/exampleauth/lib"],
40-
"SimpleSAML\\Test\\Module\\multiauth\\": ["tests/lib/SimpleSAML/modules/multiauth/lib"],
41-
"SimpleSAML\\Test\\Module\\saml\\": ["tests/lib/SimpleSAML/modules/saml/lib"]
35+
"SimpleSAML\\Test\\": ["tests", "tests/src/SimpleSAML"],
36+
"SimpleSAML\\Test\\Module\\admin\\": ["tests//modules/admin/lib"],
37+
"SimpleSAML\\Test\\Module\\core\\": ["tests/modules/core/lib"],
38+
"SimpleSAML\\Test\\Module\\cron\\": ["tests/modules/cron/lib"],
39+
"SimpleSAML\\Test\\Module\\exampleauth\\": ["tests/modules/exampleauth/lib"],
40+
"SimpleSAML\\Test\\Module\\multiauth\\": ["tests/modules/multiauth/lib"],
41+
"SimpleSAML\\Test\\Module\\saml\\": ["tests/modules/saml/lib"]
4242
}
4343
},
4444
"require": {

‎composer.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎modules/cron/bin/cron.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
$baseDir = dirname(dirname(dirname(dirname(__FILE__))));
1212

1313
// Add library autoloader.
14-
require_once($baseDir . '/lib/_autoload.php');
14+
require_once($baseDir . '/src/_autoload.php');
1515

1616
if (!SimpleSAML\Module::isModuleEnabled('cron')) {
1717
echo "You need to enable the cron module before this script can be used.\n";

0 commit comments

Comments
 (0)