Skip to content

Migrate in framework #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffkayser merged 4 commits into from
Aug 25, 2020
Merged

Migrate in framework #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18617de
Migrate in framework
Aug 4, 2020
3cb4d08
Com_installer Muse Enhancements
Aug 4, 2020
b7a7dd2
Whitespace fixes
Aug 4, 2020
90bb296
Added some missing composer deps
Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion core/bootstrap/autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@
|
*/

require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'hubzero' . DIRECTORY_SEPARATOR . 'framework' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'helpers.php';
require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'libraries' . DIRECTORY_SEPARATOR . 'Hubzero' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'helpers.php';
14 changes: 11 additions & 3 deletions core/composer.json
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"pear/net_dns2": "1.4.*",
"hubzero/orcid-php": "0.*",
"league/flysystem": "1.0.*",
"hubzero/framework": "dev-master",
"hubzero/flysystem-github": "dev-develop",
"nao-pon/flysystem-google-drive": "~1.1",
"php-amqplib/php-amqplib": "2.5.*",
Expand All @@ -54,12 +53,21 @@
"solarium/solarium" : "3.8.1",
"cilogon/oauth2-cilogon": "^1.1",
"srmklive/flysystem-dropbox-v2": "^1.0",
"stevenmaguire/oauth2-dropbox": "^2.0.0"
"stevenmaguire/oauth2-dropbox": "^2.0.0",
"composer/composer": "1.6.3",
"phpoffice/phpspreadsheet": "1.4.1"
},
"require-dev": {
"mockery/mockery": "dev-master"
"mockery/mockery": "dev-master",
"hubzero/standards": "dev-master",
"jakub-onderka/php-parallel-lint": "0.9.*",
"phpunit/dbunit": "1.4.*",
"phpunit/phpunit": "4.*",
"satooshi/php-coveralls": "1.0.*",
"squizlabs/php_codesniffer": "2.*"
},
"autoload": {
"psr-0": { "Hubzero": "libraries/" },
"psr-4": { "Bootstrap\\": "bootstrap/"},
"classmap": [ "libraries/joomla" ]
},
Expand Down
51 changes: 2 additions & 49 deletions core/composer.lock
100644 → 100755
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading