Skip to content

Conversation

@cornelisonc
Copy link
Contributor

running dewdrop-sniff on files resulted in many issues; all have been resolved with this pull request.

@cornelisonc cornelisonc self-assigned this Dec 27, 2016
use Dewdrop\Admin\Component\ComponentAbstract;

namespace Dewdrop\Admin\PageFactory;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would replace namespace Dewdrop\Admin\Component\ComponentAbstract; with namespace Dewdrop\Admin\PageFactory; since normally we put the applicable namespace for a class as the first PHP directive, followed by any use statements needed for that class.

* 'master' of github.com:DeltaSystems/dewdrop:
  Global code should be enclosed in global namespace declaration
  Resolve issues in GenAdminComponent CLI
*/

namespace Dewdrop\Admin\Component\ComponentAbstract;
namespace Dewdrop\Admin\PageFactory;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@darbyfelton something like this? Nice catch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! 👍

* upstream/master:
  Filter any spreadsheet column values being assigned to date fields.
  Also allow application/octet-stream for imports.
  Added application/zip mimetype to import filter
  Undo bd33701 for composer.json to resolve bogus ZF package versions
  Add hook to \Dewdrop\Admin\Page\Stock\ImportMapFields::isValid() to enable subclasses to prevent valid fields from being associated with error messages in data imports
  Revert "s/private/protected/g for \Dewdrop\Admin\Page\Stock\ImportMapFields extensibility"
  s/private/protected/g for \Dewdrop\Admin\Page\Stock\ImportMapFields extensibility
  CLI to facilitate generating models, tables, admin files for Users and Security Levels for standalone applications
  Use new class name for delete buttons in row collection editors UI.
  Fixes for RowCollectionEditor delete buttons and row editors with custom save callbacks.
  Restore ability to pass array of page names to onPageDispatch.
  Update ZF1 admin controller to support activity log integration.
  Add getCurrentUserId() method to EnvInterface and drop environment-based conditional logic from Db\Table.
  Add method to table view helper to render a <tfoot> section.
  Improve handling of direct routing to an admin component in Silex.
  Support arguments that take no value.
* 'master' of https://github.com/DeltaSystems/dewdrop:
  Add view helper for file size
  Support for reference column in AbstractFilter
  Temporarily removing hack for Silex tests.  Potentially causing strange issues with new password hashes.
  Dewdrop ActivityLog UserInformation to support CLI usage
  Add ability to set a save callback on M2M Relationship
  Mock out the getHelperFilters() method during CsvCell.Content rendering tests.
  PHP 7 "only variables can be passed by reference" fix for dbdeploy tests.
  Fix for some tests broken by a Silex change.
  Highlight WP admin sub-menu item associated with current page
  Fix use of pages other than Index in WP sub-menus.
  jQuery -> $
  Don't throw exception when group key value is null
  Restore Bootstrap tooltip plugin to usual location even when jQuery UI tooltip is not in use
  Render a view without setting path
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants